had to commit to leave this branch; don't use this version of this file
Add Trigger code to Server.js
Create dailyBatch.js
Merge pull request #16 from PlantAlert/delete-city

added delete user from city; refactored test file
here you go
Add cityNameConversion, cleaned up delete routes
can now retrieve from open weather.
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
all done for mostly but not really
added sinon test for weather notification
combined test-weather-call and weathertesting
the async weather calls are all juggled; still need to fix the tests
fix merge conflicts
Merge pull request #20 from PlantAlert/juggling-weather

Juggling weather
Adding the APN stuff, not ready yet
Remove inside apn folder
Merge pull request #22 from PlantAlert/apple-push-notifs

Apple push notifs
Added sinon to package.json
resolved city routes merge conflict