Add support for nginx
Merge branch 'master' of github.com:jimmyhillis/sublime-settings

Conflicts:
	Packages/User/Package Control.sublime-settings