updates to new smaccm model
Merge branch 'develop' of https://github.com/smaccm/smaccm into develop