adding missing options to interfaces.afni.Resample
Merge branch 'master' into afni/resample

* master: (42 commits)
  fixed applymask output
  fixed test
  Fixed some details for the PR #530
  Removed accidentally added files (#530)
  Updated changelog
  Updated dMRI and fMRI pre-processing
  Added motion correction pipeline
  Modified FSL FLIRT interface to provide log support
  Polished code
  buildtemplateparallel.sh - issue with input files
  Update legacy.py - buildtemplateparallel.sh
  Minor fixes
  Added MBIS to sub-package configuration list
  Standardized import to add all utilities at once
  First implementation for MBIS
  New EPI dewarp workflow (#525)
  New EPI dewarping using a workflow
  api: force users to explicitly define whether to sort files
  BF: Fix SplitNifti to generate unique filenames for outputs.
  added mask input for bias field correction
  ...
pep8
merge
changelog
Merge branch 'afni/resample'

Conflicts:
	CHANGES
	nipype/interfaces/afni/tests/test_preprocess.py