salting finished up, merging into master

Had some difficulties rebasing this.  Gave up, so this is a messy commit to resolve #12