Updated rc files
Merge branch 'master' of https://github.com/pikma/Config

Conflicts:
	vim/bundle/vundle
	vimrc
Remove gitmodules
Reinit vundle submodule