Cleaned up code and imports, updated Travis to build with dmd 2.066