Merge pull request #25 from bodepd/puppet_fixes

Puppet fixes
Merge pull request #26 from bodepd/remove_client_package_installs

remove client package installs
Merge pull request #27 from bodepd/ensure_ssh_cmd_exit

Ensure ssh cmd exit
Merge pull request #28 from bodepd/update_script

Add more logic to tests
Merge pull request #29 from bodepd/test_script_updates

minor test updates
Merge pull request #31 from bodepd/fix_typo

Fix typo
Merge pull request #32 from bodepd/sleep_1_sec

add sleep in between vm poweroff and delete
Merge pull request #33 from bodepd/master

update vm names for openstack node
Reorganize basic_test.sh

move the tests to the tests directory.

split out commands specific to deploying the multi-node
VM stuff to its own file.