WIP: Remove regex from discovery#42

shepherdjay wants to merge 3 commits into

TomFaulkner:masterTomFaulkner/SenseMe:masterfrom

shepherdjay:mastershepherdjay/SenseMe:masterCopy head branch name to clipboard