Various updates to support running Orca stand-alone
Merge branch 'master' of github.com:dyoder/orca