Pre-merge tweaks
Merge branch 'master' of github.com:crrobinson14/hotpi