Merge pull request #344 from scottfrederick-spring-cloud

 - Rebase scottfrederick:spring-cloud on spring-io:master
 - Review and polish
 - Merge from local scottfrederick-spring-cloud branch

Resolves #344