Merge pull request #6 from guardianproject/npex_work

Let front end handle content provider authority
Added some default Settings values into XML, require tor in particular
Fix to requireTor
Fix for Tor SOCKS proxy usage
Merge branch 'master' into npex_work