Add support for non-PORTLAND addresses
Merge branch 'master' of github.com:ucb-sts/sts