Add fix for xfce4-terminal 0.6.1
Add fix for xfce4-terminal 0.6.1
Updates
Merge branch 'master' of https://github.com/inhies/dotfiles
Added golang vim tools
Merge branch 'master' of https://github.com/inhies/dotfiles

Conflicts:
	git/aliases.zsh
Added fugitive for mergetool