Merge branch 'develop' of git://github.com/continuuity/weave into develop

Conflicts:
	README.md
Merge branch 'develop' of git://github.com/continuuity/weave into develop

Conflicts:
	README.md