Minor refactor to a cleaner fix for #341. Also fix DebugHud now.
Revert back changes to UI class as it should not need to know Console's innards.
For Travis CI - switch CI build to use OS X build environment.