Stop overriding envvars nilly-willy

It's confusing. :(
Merge branch 'my-rpi' into laptop