Cleaned up workstatus code.
Merge pull request #154 from kaspernj/kj/workstatus/cleaned_up

Cleaned up workstatus code.
Merge remote-tracking branch 'origin/master' into kj/tasks/progress_bar

Conflicts:
	app/assets/stylesheets/application.css