Deployment Tests Cleanup

Did some cleanup of variable names and made the filename for the .json static
(site-layout.json).
Fix headnode_show on uncreated headnode
Put spaces inbetween help arguments
Merge pull request #239 from gsilvis/fix-help

Put spaces inbetween help arguments
Removed variable for string only used once
Merge pull request #238 from ryabouza/deployment-cleanup

Deployment Tests Cleanup
Merge pull request #240 from gsilvis/fix-show-headnode

Fix headnode_show on uncreated headnode
Merge branch 'devel' into modularize-drivers

Conflicts:
	deployment.cfg.example