Better error messages
Merge branch 'gh-pages' of github.com:probmods/esslli2014 into gh-pages