configured REST and Streaming clients for Twitter API
resolved merge conflicts
added gmaps gem
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge pull request #21 from abcm1989/master

google maps api