Laptop stuff
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	vim/bundle/slimv.vim
	vim/bundle/tagbar
	vim/bundle/ultisnips
	vim/bundle/vim-clojure-static
	vim/bundle/vim-fugitive
	vim/bundle/vim-pandoc
	vim/bundle/vim-scala
Laptop stuff
Merge remote master