Big cleanup
Bump version
Change hostname determination method to the default of 'smart'
Bump version we want to 3.3. Fix owner of config files for new version.
Merge branch 'update_to_3.3' of github.com:scottso/cookbook-diamond into update_to_3.3
Final cleanup.
Set up to run as root so we can collect things like kvm stats.
Merge pull request #17 from scottso/update_to_3.3

Update to 3.3