updated vimrc for easy indenting
updated vimrc after merge conflict
Merge branch 'master' of github.com:jshawl/dotfiles
added command remappings for quick save and exit