Refactor to allow device filtering
Merge branch 'master' of github.com:RickyCook/hwdash-prototype