Merge pull request #207 from claco/master

Merged automatically by jenkins after successful build test
Updated UPGRADING
File/version cleanup

- Add various things to gitignore/chefignore
- Move metadata to VERSION file