minor updates
Merge branch 'master' of https://github.com/spierp/salish_2