Add in lots of new stuff
Build
Merge branch 'master' into gh-pages