update berksfile to work with berks 2.x
Merge remote-tracking branch 'upstream/master' into upstream/2014-01-12_03-21-56
Merge pull request #31 from rackspace-cookbooks/upstream/2014-01-12_03-21-56

upstream/2014-01-12_03-21-56