Clean up server and try to set up unit testing (not done)
Merge branch 'master' of https://github.com/mpwoz/carpool