Merge branch 'master' of github.com:masscut/dotfiles
add .berkshelf/config.json