cleanup
Merge branch 'master' of https://github.com/jmesmon/dotfiles

Conflicts:
	%.config/i3status/config
	.ycm_extra_conf.pyc