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

Cleaned settings.js
Added some fixes to keyboard navigation (reverts dde07a613f70448d21b8139c077b2b0a361b338a)