fixed treatment of filename when namesource is not a file
test also for parameter based source name for output file
fixing command filename tests
Merge remote-tracking branch 'origin/pr/807'
better handling of strings
Merge branch 'master' of https://github.com/nipy/nipype.git