added commented vhost configs
updated dev stuff
Merge branch 'wspace_configs'

Conflicts:
	manifests/nodes/local.pp
added rackspace
added devnode
Merge branch 'wspace_configs'

Conflicts:
	manifests/nodes/local.pp
	manifests/nodetemplates/devnode.pp
fixing
Merge branch 'wspace_configs'

Conflicts:
	manifests/nodetemplates/devnode.pp
update
Merge branch 'wspace_configs'

Conflicts:
	manifests/nodes/local.pp
	manifests/nodetemplates/devnode.pp
j
added file
added files
fdsfs
tests