Update gh-pages with latest from master

Main reasoning behind this is to bring the gh-pages up to speed, more specifically I want the newly moved peer2peer page (pull request #92 ) served.