Add Unite.vim + colors, improve keymappings
Merge from work