misc changes
Merge branch 'master' of github.com:ioncache/dotfiles

Conflicts:
	.gitconfig