Merge pull request #236 from stayradiated/master

Update
Merge pull request #237 from stayradiated/syncing_prefs

Merge pull request #236 from stayradiated/master
Update Cakefile for coffee-scrunch
Merge branch 'master' of https://github.com/stayradiated/Nitro into base

Conflicts:
	Cakefile