adding some steps back in
Merge branch 'DBScan' of github.com:project8/katydid into DBScan
merge conflict resolved