Stylistic changes
Branch to safari
Merge branch 'safari' of https://github.com/mauricelam/ScrollMaps into safari

Conflicts:
	prefmaker.js