upgrade to django 1.6
use persistent database connections
Merge branch 'feature/django1.6' into develop
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop