desktop variants
Merge remote-tracking branch 'desk/master' into desktop

Trying to push current master back to desk
added supertab plugin as a submodule
edited 'SuperCleverTab' out of vimrc

The problem I'm having is that I want <tab> to act like a tab
(inserting 4 spaces or spaces up to the nearest tabstop) when
I'm at a line beginning, or somewhere in a line following a space.
Hopefully supertab will do this better.
a few additional zshrc aliases

added po for popd
lsa
and switched history to give full history
testing out oh-my-zsh
default omz zshrc
playing with omz
tweaking .zshrc file with omz added
adding vim-scmdiff as a submodule (pathogen plugin)
some history settings in .zshrc

added settings to share history
added nerdtree vim module in pathogen

using submodule add.
Merge branch 'omz' into 'master'

Conflicts in .gitmodules were resolved to include all submodules
Merge remote-tracking branch 'desk/master'

not sure why this wasn't merged before