Merge pull request #630 from rdsubhas/master

Vagrant and Chef enhancements
Get default data from Request Headers if available
Remove unnecessary files
Updated infrastructure submodule
Small backwards-compatible changes to the API