Merge pull request #1297 from dorkster/fixes

Split parsing of menus/config.txt to reduce duplicate code