merge web/owm.py into master