stray mater tweaks
Merge branch 'simplify'

Conflicts:
	smallpaper/apps/stream/models.py
	smallpaper/common/assets/css/smallpaper.css
	smallpaper/templates/common/stream/elements/tumblr_photo.html
	smallpaper/templates/smallpaper/layouts/page.html
dont load old compress