Merge branch 'master' of https://github.com/limichaelc/PTX2
fixed bookshelf url
Merge branch 'master' of heroku.com:ptonptx2

Conflicts:
	ptx2app/scraper/scrape.py
trying to fix conflict in scrape
Merge branch 'master' of https://github.com/limichaelc/PTX2
bookshelf edit
Merge branch 'master' of https://github.com/limichaelc/PTX2