Merge branch 'doc/changes' of https://github.com/mgxd/nipype into doc/changes

Author: mgxd

CHANGES

@@ -1,6 +1,17 @@
-Upcoming release 0.13
+Upcoming Release
 =====================
+* ENH: Update ReconAll interface for FreeSurfer v6.0.0 (https://github.com/nipy/nipype/pull/1790)
+* FIX: Cast DVARS float outputs to avoid memmap error (https://github.com/nipy/nipype/pull/1777)
+* FIX: FSL FNIRT intensity mapping files (https://github.com/nipy/nipype/pull/1799)
+* ENH: Additional outputs generated by FSL EDDY (https://github.com/nipy/nipype/pull/1793)
+* TST: Parallelize CircleCI build across 4 containers (https://github.com/nipy/nipype/pull/1769)
 
+0.13.0-rc1 (January 4, 2017)
+===============================
+ 
+* FIX: Compatibility with traits 4.6 (https://github.com/nipy/nipype/pull/1770)
+* FIX: Multiproc deadlock (https://github.com/nipy/nipype/pull/1756)
+* TST: Replace nose and unittest with pytest (https://github.com/nipy/nipype/pull/1722, https://github.com/nipy/nipype/pull/1751)
 * FIX: Semaphore capture using MultiProc plugin (https://github.com/nipy/nipype/pull/1689)
 * REF: Refactor AFNI interfaces (https://github.com/nipy/nipype/pull/1678, https://github.com/nipy/nipype/pull/1680)
 * ENH: Move nipype commands to group command using click (https://github.com/nipy/nipype/pull/1608)
@@ -29,7 +40,6 @@ Upcoming release 0.13
 * ENH: Added support for custom job submission check in SLURM (https://github.com/nipy/nipype/pull/1582)
 * ENH: Added ANTs interface CreateJacobianDeterminantImage; replaces deprecated JacobianDeterminant
        (https://github.com/nipy/nipype/pull/1654)
-* ENH: Update ReconAll interface for FreeSurfer v6.0.0 (https://github.com/nipy/nipype/pull/1790)
 
 Release 0.12.1 (August 3, 2016)
 ===============================