Updates to book and workshops
Merge branch 'master' of https://github.com/ladydanger/books