zshrc vimrc xsessions and ipython notebook
Removed upgrade oh my zsh
Merged (badly)
Better merge for vimrc
Added oh-my-zsh as a submodule and added custom configs for it