Delete static modules from step-0 puppet templates
Fix some template generation errors
Add deploy files for specific capistrano options per step
Fix tests to accomplish the refactor