Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:seanbradley/Dreamworld
Merge branch 'develop'
Merge branch 'master' of github.com:seanbradley/Dreamworld
Minor tweak to decorator in views.py.
Remove some old files.