Smb cleanup Merge

[Katetc]

TO DO: Test, merge, document, and tag the next feature branch for CISM
https://github.com/ESCOMP/CISM/tree/lipscomb/smb_cleanup.v2

[Katetc]

Here's the PR for the code: #75