Allow the user to specify target filenames of cloned disk drives.
Fixed some whitespace errors found by pep8.
Merge branch 'cambrant-master'
Cleanup of the clone instance template
Merge pull request #309 from cambrant/master

Cleanup of the clone instance template
Merge remote-tracking branch 'base/master'