replace psi with psi-plus
Merge branch 'master' of github.com:sshilovsky/config

Conflicts:
	.autorun