Merge remote-tracking branch 'origin/master'

remove unused condition when checking for vcap_services

Author: germanattanasio

watson_developer_cloud/watson_developer_cloud_service.py

@@ -59,7 +59,7 @@ def __init__(self, vcap_services_name, url, username=None, password=None, use_vc
         self.jar = None
         self.set_username_and_password(username, password)
 
-        if use_vcap_services and (not username or username == 'YOUR SERVICE USERNAME'):
+        if use_vcap_services and not self.username:
             self.vcap_service_credentials = load_from_vcap_services(vcap_services_name)
             if self.vcap_service_credentials is not None:
                 self.url = self.vcap_service_credentials['url']