indentation and forms
Merge branch 'gh-pages' of https://github.com/DellGDC/sherpa into gh-pages