Update update-fork.sh

Add no edit flag when merging
Merge branch 'develop' of github.com:cinchapi/concourse into develop