things
fiddle.
Merge branch 'master' of https://github.com/jmesmon/dotfiles

Conflicts:
	_.vim/bundle/nerdtree
	_.vim/bundle/vim-pathogen
things