Change to KeepassX
Merge branch 'master' of https://github.com/louisch/dotconfig

Conflicts:
	mpd/state