Start working on syncing prefs
Merge branch 'master' of https://github.com/stayradiated/Nitro into syncing_prefs

Conflicts:
	bugs.md
	codekit-config.json
Merge branch 'master' into syncing_prefs

Conflicts:
	app/utils/conf.coffee
Merge branch 'syncing_prefs'