Merge branch 'master' of github.com:watson-developer-cloud/python-sdk into develop

Author: ehdsouza

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.2.1
 commit = True
 tag = True
 

README.md

@@ -21,14 +21,24 @@ or
 easy_install --upgrade watson-developer-cloud
 ```
 
-Note: If you run into permission issues try:
+Note the following:
+
+a) If you run into permission issues try:
 
 ```bash
 sudo -H pip install --ignore-installed six watson-developer-cloud
 ```
 
 For more details see [#225](https://github.com/watson-developer-cloud/python-sdk/issues/225)
 
+b) In case you run into problems installing the SDK in DSX, try
+```
+!pip install --upgrade pip
+```
+Restarting the kernel
+
+For more details see [#405](https://github.com/watson-developer-cloud/python-sdk/issues/405)
+
 ## Examples
 
 The [examples][examples] folder has basic and advanced examples.

setup.py

@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 
 if sys.argv[-1] == 'publish':
     # test server

watson_developer_cloud/version.py

@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.2.1'