Merge branch 'master' of github.com:smwesten-usgs/swb