Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Fixed twitter box and newsfeeds
Merge pull request #27 from climatepolicy/master

merge me