add timeframe to merge_stats
fix stats building url
fix new device calculation algo
build ifs before assoc array for discoverers cache
added cfnetwork discoverers task + rewrote android rules
added shell task to do the regular import/sort... stuff