Fixed issues from previous merge

 Changes to be committed:
	modified:   .vimrc