namespace these more reasonably (no functional change)
Merge branch 'master' of github.com:omniti-labs/reconnoiter