Added flag to disable use of third party scanners. Minor cleanup
Version bump to 2.0