fixes
Merge branch 'master' of https://github.com/hspasta/dotfiles

* 'master' of https://github.com/hspasta/dotfiles:
  merge error fixes

Conflicts:
	X/xinitrc
	i3/config
	subl/Preferences.sublime-settings