Commit from home
Merge branch 'master' of https://github.com/chin4ski/dot_files

Conflicts:
	.Xresources
	.gitmodules
	.vim/.vimrc
Fix