Split out robot-only part of setup
Add Brandon's machine
Updated readme file with instructions for completing the cdist installation
Merge remote-tracking branch 'thesmooth/samplereturn' into samplereturn

Conflicts:
	cdist/conf/manifest/samplereturn