ref: changing filename generation to a more consistent model
fix: added name_template to metadata keys
fix: make sure mandatory=False items are displayed
fix: removed all mandatory=False
doc: added information about new name generation mechanism
enh: updated FLIRT to use new name generation mechanism to match with doc example
doc: updated CHANGES to reflect new name generation mechanism
Merge branch 'master' into fix/invwarp

* master:
  fix: ridiculous mistakes
  fix: make sure mandatory=False items are displayed
fix: change dict comprehension to list comprehension for 2.6 compatibility
fix: ordered dict
fix: more dict comprehension fixes
backward compatibility import
fixed a typo
removed doubled declaration
added mandatory dtatgrabber field
backward compatibility import
fixed import
PEP8
Merge branch 'pr/686'

Conflicts:
	nipype/interfaces/fsl/utils.py
Removed left over class