added command line mappings
cleaned up vimrc