New vimrc, for new vundle release

Conflicts:
	vimrc
Screen lock upon suspend