Merging conflict with vim-less and snipmate
Adding snipmate.vim and updating settings in vimrc.