Clean up stackstrap.yml before finishing
Merge remote-tracking branch 'origin/master'

* origin/master:
  Updated with new Org name.