Weather API stuff done more.
Merge branch 'master' of https://github.com/carney071/codeNameWEAR

Conflicts:
	Resources/iphone/alloy/controllers/Weather.js
	app/controllers/Weather.js
	app/controllers/index.js