production tweaks
Merge branch 'master' into user-accounts

Conflicts:
	reader/reader/apps/feed/views.py