2.5 complete
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:atheiman/atheiman.github.io into gh-pages