added d3 colorbrewer to css
tweaked js
resolved merged conflicts
resolving issues in controller
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
fixed color cloud
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/gov
Merge pull request #84 from abcm1989/master

refactored wordcloud
fixed merge conflict