Merge pull request #26 from langner/master

Some random small changes and one regression fix
Remove duplicated line (same as in #24)
Add 'from __future__ import print_function' to files that print
Merge pull request #28 from ATenderholt/future

Add 'from __future__ import print_function' to files that print