Add django aliases and heroku stuff
Merge work and personal version