jade and prettify settings
Merge branch 'master' of github.com:jvdamgaard/st3-sync

Conflicts:
	Package Control.sublime-settings