migrations created and tests written. 2/5 models working
ready to merge, just need some basic spec tests
Merge branch 'master' into notes