Encode the hostname into the prompt
Merge branch 'laptop' into my-rpi