annotated models
Merge branch 'master' of https://github.com/thebenedict/cowsnhills
clean up migrations