update dotfiles config
Merge branch 'master' of https://github.com/goraxe/dotfiles

Conflicts:
	.dotfiles