Update git-now recipe to use 'git' resource
Merge branch 'develop'