small cleanup of server and city model; tests still in progress
Merge pull request #30 from PlantAlert/sinon-tests

small cleanup of server and city model; tests still in progress