keymapとか
Merge branch 'master' of github.com:ichi/sublime_text_2_settings

Conflicts:
	Package Control.sublime-settings