Added vim stuff
Terminal change and some others
Merge branch 'xfce4' of github.com:shaladdle/dotfiles into xfce4

Conflicts:
	xmonad.hs
	zshrc
Moved from bash_mine to zshrc_local