Update to Berkshelf v3
Add Berksfile.lock
Merge pull request #27 from mlafeldt/berkshelf-v3

Update to Berkshelf v3
Run Travis against 2.1