Only do Settings DB query when necessary
Merge pull request #6 from Flynsarmy/optimizeBoot

Only do Settings DB query when necessary