Get-you-going hacks to configure system
Merge branch 'master' of https://github.com/jmacritchie/DougMatcher