Added berkshelf api source to Berksfile (Upgrade to Berkshelf v3)
Replace outdated Vagrant file with a newly 'berks generated' one
Merge branch 'master' into develop
Changed config.vm.box to use an up-to-date CentOS 6.5 box from Vagrant Cloud
Fixed comment formating: added line break
Fixed comment formating: removed blank
Update Berksfile

Use supermarket instead of api.berkshelf.com
Merge pull request #9 from jossy/develop

Updated Berksfile and Vagrantfile