Added vim-coffee-script and some cleanup
merged stuff from desktop