Merge branch 'master' into gh-pages
Fixing the DEPLOY see if it will build now
Merge branch 'gh-pages'