Fixed for Ethan's old version of Python.
Merge branch 'master' of github.com:dylanfprice/hutmap
Merge branch 'dreamhost' of github.com:dylanfprice/hutmap
Version f79c7caa-ff01-11e2-8f62-0017f2d41fb6