Added the new search mappings to the vimrc
Cleaned up the file a tad