Merge branch 'master' into shaun
minor bug
tmp
tmp
Committing for Divi
consalidating document.ready calls into main.js
improved location lookup
Merge branch 'master' into shaun

Conflicts:
	_css/main.css
Merge branch 'master' of https://github.com/theguice/holiday-viz

Conflicts:
	_js/data-clean.js
separate clean and update index
minors
Merge branch 'master' into shaun

Conflicts:
	_css/main.css
Merge branch 'shaun'
minor
cleanup
improved layout
Layout changes, user locations
fixing image names with bad chars
Zoom working.. added night view:)
Merge branch 'master' of https://github.com/theguice/holiday-viz