add ability to disable config via properties

spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import;
 @Configuration
 @Import(ConsulAutoConfiguration.class)
 @EnableConfigurationProperties
-@ConditionalOnProperty(name = "spring.cloud.consul.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true)
 public class ConsulConfigBootstrapConfiguration {
 
 	@Autowired

spring-cloud-consul-sample/src/main/resources/application.yml

@@ -1,11 +1,6 @@
 server:
   port: 8080
 
-#TODO: figure out why I need this here and in bootstrap.yml
-#spring:
-#  application:
-#    name: testConsulApp
-
 ribbon:
   ServerListRefreshInterval: 1000