Bump version
Merge branch 'update_to_3.3' of github.com:scottso/cookbook-diamond into update_to_3.3
Final cleanup.