Changes weather keys to strings
Merge branch 'master' of https://github.com/team-cocoa-pebbles/pebble-app

Conflicts:
	kiwi/src/kiwi.c