added twitter streaming
fixed merge conflict
fixed environment.rb
edited seed file
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
included geolocation methods
added quasi maps
added workaround for accents
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge pull request #31 from abcm1989/master

seed file
resolved seeding issues!(mostly)
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge pull request #32 from abcm1989/master

resolved seeding issues
added some maps and beginning of twitter stream usage, including helper
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
added some maps and beginning of twitter stream usage, including helper
Merge pull request #33 from eshem/master

maps
fixed merge conflicts
commented out tweet stream helper