Cleaned settings.js
Added a timeout to the SSL checks
Merge pull request #693 from JimmyThompson/dev-0.3-settings

Cleaned settings.js