Small fixes
Merge branch 'master' of https://github.com/pauloremoli/pywall

Conflicts:
	pywall/funnycats/funnycats.py