add vi mode to env
update taskpaper theme
update gitconfig
adding a tree alias (thanks jdk)
slight mod to taskpaper theme
move to NERDTree from netrw since netrw hasn't been working right lately
spice up my prompt
adding some git aliases
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scm/gitconfig
cleaning up git aliases
adding branch to shell