export missing settings and fix bookmarklets
Merge remote-tracking branch 'yelp/master'

Conflicts:
	core/settings.py