commiting vimrc to allow for a happier merge
merged changes from master