PY3+RF: fix issue in python3 not picked up by 2to3. Addresses https://github.com/PyMVPA/PyMVPA/issues/130
???: embedded comments into volume_mask_dict for TODO (+ minor code changes and DOC changes)
ENH: remove "shape" as explicit argument in FlattenMapper.__init__
Merge branch 'master' of https://github.com/PyMVPA/PyMVPA
DOC: Fix minor spelling/grammer in tutorials 0-2

Mostly minor spelling or grammer fixes, with a few sentence rewrites to
hopefully improve clarity.  Also updated a few outdated links
DOC: Fix minor spelling/grammer in tutorials 3-6
NF: test for queryengine i/o
Merge branch 'enh/surfing' into _tent/surfing
BK+API: rename "aux_get" to "get_aux"
DOC: more documentation and some answers to issues raised by Yarik
BF: return proper meta data even when set to False or None
BF: return proper meta data even when set to False or None
DOC: explain why use of "merge" instead of "update"
RF: use get_aux instead of deprecated aux_get
NF+BK? more efficient storage of voxel selection results as suggested by Yarik
TST+NF+ENH: test "old-style" (pre-Dec 2013) way of storing and loading voxel selection results to disc, and separate the "old" logic from the "new" using a separate _setstate_legacy method
DOC: minor explanation of rationale of testing legacy voxel selection storage
RF: seperate __setstate__ functionality in _setstate and _setstate_legacy (the latter with deprecation warning)
BF: fixed typo
ENH: support merging of voxel selection results even if they have different subtypes (e.g. float32 and float64)