Update ctrlp.vim config
Update vim config
Update vimrc
Update vimrc
Merge branch 'master' of github.com:othree/rc

Conflicts:
	home/.vimrc