pristine ionic 356afdf04f0cbd44c3f40608343ab28699730e8e
pristine ionic a0d60d5228e385b952d6561ed6454e6add45401e
make sure we are on master before pulling
fix jshint errors
they have switched to gulp
pristine ionic 1130f60902e7088e856fd67a34d4d39987c301fc
Merge branch 'ionic-pristine'

Conflicts:
	app/styles/_variables.scss
back to pristine ionic variables, override in cruisemonkey.scss instead