stuff
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge pull request #1 from bkardell/master

merge