update master with minor fixes
Merge commit '77e98d2710b60fbd7f4ab6b5c8f945ea3e66f9f5' into gh-pages

Conflicts:
	cookbook.Rmd
	figure/unnamed-chunk-3-1.png
	index.html
	readme.Rmd