Add vim-coffee-script
Fix vim-diff bug & edit some config