config updates
Merge branch 'master' of github.com:hugochinchilla/dotfiles

Conflicts:
	.i3/config