port mapping, datavolumedir, tests, small fixes

What about [PEP8](http://legacy.python.org/dev/peps/pep-0008/#imports)?