Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
turned off turbolinks. it was screwing up the jquery.
fixing merge conflict
Merge pull request #56 from cblokker/master

turned off turbo links for states view