i3 tweaks

Conflicts:
	.i3/shell.sh
Change go settings in vim