fixed various things
Merge branch 'master' of github.com:ngs-docs/2013-norwich-biology