Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages
Tweaks around options and multiple files
Remove gh-pages branch dragged into master

This reverts commit a5bdcdfd7de672659009d47710a3beea5c1796a6.
Updated version prior to push to npm
Updated version prior to push to npm
Merge branch 'master' of github.com:abovethewater/grunt-doco
Merge remote-tracking branch 'abovewater/master'

* abovewater/master:
  Updated version prior to push to npm
  Updated version prior to push to npm
  Remove gh-pages branch dragged into master
  Tweaks around options and multiple files
  Create gh-pages branch via GitHub

Conflicts:
	package.json