a
Merge branch 'master' of https://github.com/Nymphium/settings

Conflicts:
	settingfiles/sources/keymap.vim
20141111_03:02:58