improved location lookup
Merge branch 'master' of https://github.com/theguice/holiday-viz

Conflicts:
	_js/data-clean.js