more changes
some more stuff
Merge branch 'master' of https://github.com/joelash/dotfiles

Conflicts:
	bash/aliases
	bashrc.jfriedman
	vimrc
cleanup