added mock
removed commented out lines
Handle cases for partition with leader=-1 (not defined)
Merge branch 'master' into develop
check for broker None in send_broker_aware_request (added test for it)
Changes based on comments by @rdiomar, plus added LeaderUnavailableError for clarity
fixing _get_leader_for_partition unittests
Update example.py to compile, add friendly load_example.py
Minor refactor in conn.py, update version in __init__.py, add ErrorString
Update logging config to include timestamps for better/easier debugging
Fix grammar in error string
Merge branch 'master' into conn_refactor

Conflicts:
	example.py
Update load_example
Modified SimpleProducer to randomize the initial round robin ordering
of partitions to prevent the first message from always being published
to partition 0.
Modified SimpleProducer-based integration tests to work now that
the initial round-robin ordering of partitions have been randomized
Check against basestring instead of str in collect.hosts.
Merge branch 'master' into develop

Conflicts:
	test/test_unit.py
Merge pull request #144 from frgtn/check_basestring_in_collect_hosts

Check against basestring instead of str in collect.hosts.
Merge branch 'master' into conn_refactor
Fix py26 compatibility issue, add mock to tox