Revert "Revert "Merge branch 'gh-pages'""

This reverts commit e7029c43786f4bf9a32a8e77e903246cf7006baf.
Revert "Revert "Merge branch 'master' into gh-pages""

This reverts commit b6f935cd04f5a9d8ab76700b12ef0db49740bedf.
Messed up somehow, starting repo over