Initial django commit
Merge branch 'master' of github.com:tjsavage/apartment