pristine ionic 0d926583a481d346a325bc7fe651deadfe817c6d
4.0.0
jshint fixes, also move to prototype style object methods
ionic 0.9.24
Merge branch 'ionic-pristine'

Conflicts:
	app/styles/_grid.scss
	app/styles/_variables.scss
reenable gotonow
pristine ionic 68ffe8b7a37b2e0914df36b6a4cde49dc4f0d3f6
Merge branch 'ionic-pristine'
script for updating ionic
pristine ionic 91fbcdc1305f7bb7fd00de0a684d3a90f7b8d6ee
Merge branch 'ionic-pristine'
*working* script for updating ionic ;)
Merge branch 'master' into 4.0.x
remember current branch for merge
make sure it handles when ionic has not changed