weather updates

 - accept "city state" or "zip"
 - include place and humidity in weather response
Resolved conflicts in boonedox-master