Updated the CR mappings to leave highlight
Simplifications
Simplified .vimrc