Merge pull request #25 from akutz/feature/cleanup-userdata

Cleanup guestinfo keys such as userdata