Added tests and a bunch of clean up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/tests/getUserTests.js