Add settings
Merge branch 'master' of https://github.com/roghult/SublimeSettings

Conflicts:
	Default (OSX).sublime-keymap