add neobundle.vim
modify vimrc

change bbommarito/vim-slim to slim-template/vim-slim
Merge branch 'work'