More edits to templates
Merge branch 'master' of https://github.com/limichaelc/PTX2

Conflicts:
	ptx2/urls.py
	ptx2app/templates/ptonptx2/book_lookup.html