Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #2 from inviqa/develop

Add name metadata for berkshelf 3 / ridley compat