use simpler prompt
Merge branch 'master' into vmguest-qtile