More work on menues
Merge branch 'master' of https://github.com/ChrisFadden/blankd