Edited controls, username display
Merge branch 'master' of https://github.com/not-inept/rpi-s