Merge remote-tracking branch 'mike/master'

Conflicts:
	static/js/textbookview.js
fixed up some little errors
filing away changes to maker.py
Merge branch 'master' of github.com:wannabeCitizen/bigdipster
Merge branch 'master' of github.com:mynameisfiber/bigdipster