Merge pull request #67 from markvoelker/multi-node

Fix Bug 1194531 by making the install_os_puppet script copy templates.
Add parameters for swift horizon integration
Merge pull request #68 from rickerc/fix_horizon_swift

Add parameters for swift horizon integration
Fixed missing single quotes around swift admin tenant/user.