Merge pull request #40 from RiotGames/master

Adds Berkshelf/Vagrant 1.1 compatibility