Pushed all 6.0 updates
Merge branch 'master' of https://github.com/jmeas/Shepherd