Webapp highlighting
Merge branch 'master' of github.com:kvz/dotfiles

Conflicts:
	Sublime/User/JSON.sublime-settings