replaced str with basestring in instance checks to support unicode strings
Added input options to dcm2nii
Dcm2nii and related tests
Added whitespaces
Removed unnecessary positional parameters as well as args argument
added external package: 'six'
switched to six.string_types for string type checks
Merge pull request #1 from nipy/master

pulled updates from the main repo
Merge pull request #930 from belevtsoff/master

unicode support for string type checks, fixes #929
Merge pull request #931 from mick-d/master

Additional dcm2nii inputs
added apt caching
remove deb packages installation
Fixed tests.
Added more connectivity matrix options in Camino interface
Conmat test function
Added xor option in Camino connectivity for robustness
Added xor parameter for robustness
added no dep install version. we'll be testing on both.
fixed bash conditionals
another attempt at fixing bash conditionals