Changed the test for scan.NAME to scan.GLOBAL.  Didn't regression test.
Merge branch 'master' of github.com:mjstahl/socialmachines