Added more city name things.
Merge branch 'master' of https://github.com/AshleighC/purplerain
Improved city handling.
Merge branch 'master' of https://github.com/AshleighC/purplerain

Conflicts:
	background.js