Fix single-column contact CSV parsing.
Switch to Django 1.5.5 and django-registration 1.0.
Add SECRET_KEY which is required by Django 1.5.
Update registration views to django-registration 1.0 RegistrationView class.
Fix horrible contact upload tests.
Set absolute_max on JsboxAppConfigFormset (required by Django 1.5 although only because we're not really implementing formsets the way there were intended -- ours are too form specific).
Fix email validation during user creation.
Remove '{% load url from future %}'.
add default timeout of 5s
trap timeout err
Refactoring and tests.
Minor test cleanup.
Merge branch 'feature/issue-292-add-default-timeout-to-http-api' into develop
Merge branch 'feature/issue-243-upgrade-to-django-1.5' into develop
Merge branch 'develop' of github.com:praekelt/vumi-go into develop
Merge branch 'feature/issue-745-fix-contact-parser-csv-delimiters' into develop
Remove obsolete test helper methods.
Merge branch 'develop' into feature/adhoc-test-message-helper
Update new tests from develop to use new helpers.