these commits are from iMac - hopefully bring down MacBook commits
Merge branch 'master' of https://github.com/nygeog/msm

Conflicts:
	.DS_Store
	scripts/.DS_Store