Merge pull request #85 from eshem/master

eric
removed duplicate code and fixed merge conflicts
removed duplicate code and fixed merge conflicts
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov