Reintegrated fixes from 67a8a8c

So much simpler, messed up those changes in a merge
Merge branch 'master' of https://github.com/patrickkeenan/sketch-framer-states

Conflicts:
	Templates/framer.states.js