Shuffled some key mappings and unbundled vim-coloresque