fixing  a merge
Merge branch 'master' of https://github.com/wildflower/SCMTurboCharge into HEAD