Merge in settings

- Added prefs.js, convenience.js and gsettings schema files
- Coherent whitespaces