Took out dead beacons and turned off adjacency list feature
Merge branch 'master' of https://github.com/microcosm/beacondemo

Merging Andy's changes.#
Took out lots of beacons, simplifying location determination