Add mrk21/yaml-vim.
Merge branch 'master' of github.com:haruyama/Settings

Conflicts:
	.vim/my/neobundle.vim