style: minor cleanup
merge all unit tests

Conflicts:
	config/karma.conf.js
	package.json
	src/client/coffee/services.coffee