Added vim stuff
Added default branch push behavior=matching
Local xmonad version that uses alt as mod key
Fixed it so xfce4 stuff is ok
Merge branch 'master' into xfce4

Conflicts:
	xmonad.hs
Zshrc I'm using on os x
Adding twilight256 color scheme, trailing whitespace highlight
Merge branch 'xfce4' of https://github.com/shaladdle/dotfiles into xfce4
Added NERDTree
This file is specific to each computer
Actual vimrc
Merge branch 'master' into xfce4

Conflicts:
	zshrc