TST: test volume_mask_dict.from_any()
Merge branch 'master' into _tent/surfing
Merge branch '_tent/py3k' into _tent/surfing
Merge branch 'master' of https://github.com/PyMVPA/PyMVPA into _tent/surfing
Merge branch 'master' of https://github.com/PyMVPA/PyMVPA
ENH: typo + wrapping the failing statement to provide more information. See #162
nonfunctional changes in unifying some formatting
Adding @reseed_rng to test_queryengine_io since its random failures make no sense
ENH: adding import of VolumeMaskDictionary from the suite
Merge pull request #165 from yarikoptic/enh/troubleshoot-162

ENH: typo + wrapping the failing statement to provide more information. Attempt to get to understand the failure in #162.
ENH: resolve merge conflict
Merge branch 'master' into _tent/py3k