Stop village icons being recreated every move

Also moved map initialisation code into the initMap method.
Rename "villages" to "settlements"
Add popups for settlements
Merge remote-tracking branch 'fodaro/master'

Conflicts:
	resources/map.js