Small tweak to not do heavy math ontouchmove unless its necessary
Merge branch 'master' of github.com:imbrianj/switchBoard

Conflicts:
	css/combo.min.css
	js/common.min.js