updates to main nav and that content
Merge pull request #13 from Ecotrust/gh-pages

get emma's changes
Merge remote-tracking branch 'emma/gh-pages' into gh-pages
rename new show and small post updates
geojson from voices
popovers on map
adding touch, too
Merge pull request #8 from Ecotrust/gh-pages

Thursday Updates