Fixed the DB. There are now no 'known' errors
Ignoring modules
Merge branch 'master' of github.com:paulbooth/entrance
Started adding command logic to local app
Fixed stupid conflicts