popcorn-official/popcorn-app — pull request #693 by JimmyThompson (2014-05-26 17:12:55+00:00)
Title: Cleaned settings.js

Re-post of Pull Request #692, now able to automatically merge.