old gnome terminal changes
Merge branch 'master' of github.com:elon/dotfiles

Conflicts:
	.vimrc