Merge pull request #25 from abcm1989/master

changed migrations and models for new view
removed unnecessary methods from state
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov