Update vim colors and add quit shortcut
merge and fix conflicts