bunch of updates
Style updates
Merge branch 'master' into gh-pages
Update