got working on Stackato
Merge branch 'stackato' of github.com:Stackato-Apps/pinry into stackato

Conflicts:
	pinry/settings/production.py
	requirements.txt
	stackato.yml
	wsgi.py