Fix up paths, requirements, imports and migrations
Merge pull request #1 from brendonh/master

Fix up paths, requirements, imports and migrations