moving things around, fixing up for /book
Merge branch 'master' of https://github.com/genomicsclass/labs