Merge branch 'debug'
Merge branch 'debug'
removed old easter egg stuff
Remove command-line restriction for debug console
Better OS X Menus
Merge branch 'master' into debug
Improve output formatting