Update update-fork.sh
Merge branch 'develop' of github.com:cinchapi/concourse into develop

Conflicts:
	update-fork.sh

Change-Id: Id4f97d6e07ac1d4ee75e11ad53df55a5a1ef7ddb
Update README.md
add no edit flag

Change-Id: I999e0ed5efd3d8252710391fe2e9062a14b41c24
Merge branch 'develop' of github.com:cinchapi/concourse into develop