Update the version

Make python2.x work again

setup.py

@@ -19,7 +19,7 @@
 
 setup(
     name="sshmap",
-    version="0.6.10",
+    version="0.6.11",
     author="Dwight Hubbard",
     author_email="dhubbard@yahoo-inc.com",
     url="https://github.com/yahoo/sshmap",

sshmap/__init__.py

@@ -11,17 +11,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License. See accompanying LICENSE file.
 
-#import sshmap.sshmap
-#import sshmap.callback
-import sshmap.utility
-#import sshmap.runner
+try:
+    import sshmap.sshmap
+    import sshmap.callback
+    import sshmap.utility
+    import sshmap.runner
 
-# For backwards compatibility
-from sshmap.callback import summarize_failures as callback_summarize_failures
-from sshmap.callback import aggregate_output as callback_aggregate_output
-from sshmap.callback import exec_command as callback_exec_command
-from sshmap.callback import filter_match as callback_filter_match
-from sshmap.callback import status_count as callback_status_count
+    # For backwards compatibility
+    from sshmap.callback import summarize_failures as callback_summarize_failures
+    from sshmap.callback import aggregate_output as callback_aggregate_output
+    from sshmap.callback import exec_command as callback_exec_command
+    from sshmap.callback import filter_match as callback_filter_match
+    from sshmap.callback import status_count as callback_status_count
 
-# The actual used sshmap functions
-from sshmap.sshmap import run, run_command, run_with_runner
+    # The actual used sshmap functions
+    from sshmap.sshmap import run, run_command, run_with_runner
+except ImportError:
+    import sshmap
+    import callback
+    import utility
+    import runner
+
+    # For backwards compatibility
+    from callback import summarize_failures as callback_summarize_failures
+    from callback import aggregate_output as callback_aggregate_output
+    from callback import exec_command as callback_exec_command
+    from callback import filter_match as callback_filter_match
+    from callback import status_count as callback_status_count
+
+    # The actual used sshmap functions
+    from sshmap import run, run_command, run_with_runner