test for auto-339
moved clean-up scripts
changed docstring
Merge branch 'master' into auto-339-test
review
better docstring
Merge pull request #304 from rackerlabs/auto-339-test

Auto 339 test (ready for review)