Use Supermarket for Berkshelf
Bump to v2.1.7