Merge branch 'develop' of github.com:splunk/splunk-sdk-python into develop

Conflicts:
	splunklib/client.py

Author: Frederick Ross