update docs
add test stuff
Merge branch 'master' into gh-pages

Conflicts resolved:
	index.html