Making it look good
Merge branch 'master' of https://github.com/narrowdesign/RCDNA

Conflicts:
	sftp-config.json