Merge branch 'master' into gh-pages.
Merge branch 'gh-pages' of github.com:NCEAS/open-science-codefest into gh-pages