commit
Merge branch 'master' of github.com:tell-k/dotfiles

Conflicts:
	.vim/ftplugin/python.vim
	.vimrc.d/.vimrc.neobundle