Editing of Username and Email
Merge branch 'master' of https://github.com/stayradiated/Nitro

Conflicts:
	codekit-config.json