couple updates
Merge branch 'master' of github.com:BoulderBTC/palantir