Berkshelf2 and vagrant 1.5

This takes PR #158 and backports those Vagrant 1.5 compatibility changes to work with Berkshelf 2.x. I completely understand if you decide to close this PR outright, but I am using this locally with Vagrant 1.5 and Berkshelf 2.x without issue.