add bitters and favicon-maker
Merge branch 'master' of github.com:erinautomatic/middleman-barback
gemfile updates