Rename default node to base
Merge branch 'master' of dvgit:devopsbrett/spawncamping-octo-tyrion

Conflicts:
	manifests/site.pp