Various cleanups - no functional changes
Merge branch 'master' of github.com:mveinot/QtCBM