Merge pull request #8 from brint/repo_update

Updating for berkshelf 3