Merge branch 'dev' (Django 1.5 upgrade, Vagrant upgrade, etc.)
Releasing 0.5