Fixing errors to attend #830
Minor changes to satisfy #830
Backwards compatibility in #830
Updated CHANGES
Merge branch 'enh/EvaluationAlgorithms' into experimental

Conflicts:
	nipype/algorithms/misc.py