New version

for discussion - it needs to be co-ordinated with a pull for continuent-vagrant before merging