The state of things.
Merge branch 'master' of https://github.com/hbkk/dotfiles

Conflicts:
	.config/ranger/history