Clarifications on mode display
Fixes needed to make ubuntu build work again (at least for me)
Merge pull request #215 from geeksville/master

Minor fixes to fix build on Ubuntu
merge code from origin master