Catch weather exceptions properly
Merge branch 'bleeding' of https://github.com/svkampen/James into bleeding

Conflicts:
	plugins/weather.py