grrr
Merge branch 'gh-pages'
whoa back, buck.
update docs