Finished models and migrations
Merge pull request #2 from wolves-2014/pair-nick-brown2014,mjsteichen

Finished models and migrations