Clean up example a bit
Make example actually work
Kill some lines in the js example
Merge branch 'master' into gh-pages
Rebuild docs