clean up formatting, simplify salt2 __init__, remove unused code
Merge pull request #1 from kbarbary/rbiswas-modelerr-updates

Clean up