Rename location spec and fix formatting
Refactor user controller and specs
Clean up locaiton and proximity specs
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into test/refactor

Conflicts:
	specs/server/locationModel.spec.js
	specs/server/proximity.spec.js
	specs/server/userModel.spec.js
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into test/refactor
Merge pull request #183 from ryojiosawa/test/refactor

Refactor user, location and proximity specs