Merge branch 'master' of heroku.com:watttime

Conflicts:
	workers/views.py
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime

Conflicts:
	workers/views.py
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime
Debugging messages...
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime

Conflicts:
	workers/tasks.py
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime
Using user authentication to display and set settings.
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime

Conflicts:
	pages/views.py
	settings.py
	templates/accounts/login.html
	urls.py