Pull master into gh-pages

Realizing I pulled changes into master and we're working on gh-pages ... fixing now.