major updates, major hotness
Merge branch 'master' into gh-pages