Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov

 the commit.
merged changes with master
pulling changes Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
wired up associations in the models