Add cityNameConversion, cleaned up delete routes
recommit with less server.js stuff
Merge pull request #19 from PlantAlert/city-conversion

City conversion, new PR per Scott req, fixes some server.js stuff
fix merge conflicts