fix typo
add gitv vim plugin
vim color scheme shennanigans

Conflicts:
	vimrc
use vim for git diffs
add tabbed nerdtree
update aliases
git ignore update
remove rvm, I'm sick of it

Conflicts:
	bash_profile
update msp conference room settings
switch around xsession config
update vundler
vim color scheme shennanigans
add ctags default configurations
add some ctags defaults and vim plugins
add pretty git log aliases
ignore more vim bundle stuff
octave settings
fix EOL whitespace trim
extract common shell stuff to use with zsh
update zshrc