Merge branch 'export' of https://github.com/cmaumet/ni-dm into export

Conflicts:
	.gitignore
Merge branch 'export' of ../../nidm_copy/ni-dm

Conflicts:
	README.md
Merge commit '5601fd47cb96022e6263e1b616fde9c9baca0adb' as 'nidm'
Create a package for install using setup.py
Merge branch 'pip_package' of ../niexportForFSL
todel