weather via user ip
Merge branch 'contrib' of origin.
Applying changes from cleishm/ & dirs/ github forks.

Fixing conflicts:
	amazon/amazon.ecs.xml
	gowalla/gowalla.spots.xml