urls.py updated for django 1.6
Merge branch '1.6-update' into develop
Flake8 cleanup
Merge branch 'flake8-cleanup' into develop
Fixed indentation bug
Merge branch 'flake8-cleanup' into develop