Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/brentajones/20140109-2013donations into gh-pages