---
Merge https://github.com/ashmonger/shorter

Conflicts:
	short/forms.py
	short/models.py