Nuke and recreate migrations
Recreate migrations and merge new code
Add alex's code to branch
Merge branch 'master' into venkman
database reset
Add database from branch to master
Merge branch 'master' into venkman
Merge pull request #70 from blind-squirrel/venkman

Venkman