Merge branch 'master' into gh-pages
9-18-13-KM1

Work from the morning of the 18th.
Merge branch 'gh-pages'