added growl support
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/karma.conf.coffee
	frontend/source/javascripts/controllers/users.coffee
some small renaming / refactoring
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/source/javascripts/controllers/UserController.coffee
	frontend/source/users.slim
Merging some of the stuff I was doing
pattern for async testing in users controller
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/source/users.slim
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/source/users.slim
	frontend/spec/services/user_service_spec.coffee
	frontend/spec/users_spec.coffee
trying to get things working again
attempting to find a pattern for async testing but haven't yet
Merge branch 'master' of https://github.com/jcono/timeline
removed a console log that shouldn't be there