Commit
Merge branch 'master' of github.com:marcgibbons/geodjango-demo