adding vundle, other vimrc changes
ipython mods
moving aliases zshrc -> bash_aliases

ipython, pbcopy and various aliases
moving aliases zshrc -> bash_aliases
updated git settings
move virtualenv, plugin statements, etc in zshrc
Merge branch 'master' of https://github.com/d10genes/dotfiles

Conflicts:
	bash_aliases
	vim/vimrc.vim
	zshrc
fix merge straggler
no more kdiff3
starting to figure out bundle mgmt