adding the rest
Merge branch 'master' of https://github.com/werevamp/vim-setup

Conflicts:
	.vimrcold
	autoload/pathogen.vim
	bundle/scss-syntax.vim
	bundle/tlib_vim
	bundle/vim-snipmate
	bundle/vim-snippets