Merge branch 'gh-pages'
Swapping order of scripts
Merge branch 'master' into gh-pages