Merged webrunner
fixed webrunner conflicts
added jekyll _site to .gitignore
Merge branch 'master' of https://github.com/daleharvey/pouchdb