Removed need to use spromise.when...  linterSettings now makes sure it returns a promise when loading settings.  Some other small code cleanup