Settings update
Merge branch 'master' of github.com:cycladesnz/analyseme.co

Conflicts:
	analyseme/urls.py
Merge branch 'master' of github.com:cycladesnz/analyseme.co
Merge branch 'master' of github.com:cycladesnz/analyseme.co
Merge branch 'master' of github.com:cycladesnz/analyseme.co
Merge branch 'master' of github.com:cycladesnz/analyseme.co
Merge branch 'master' of github.com:cycladesnz/analyseme.co
gitignore binary files