Switch term to gnome terminal
add vim abbr's
Merge remote-tracking branch 'origin/master'

Conflicts:
	i3/config
	vimrc