Merge branch 'kevin-brown-issue_4' into py2n3

Conflicts:
	gitdb/base.py
	gitdb/fun.py
	gitdb/pack.py
	gitdb/stream.py
	gitdb/test/lib.py
	gitdb/util.py

Author: Byron

.travis.yml

@@ -3,6 +3,7 @@ python:
   - "2.6"
   - "2.7"
   - "3.3"
+  - "3.4"
   # - "pypy" - won't work as smmap doesn't work (see smmap/.travis.yml for details)
 
 script: nosetests

gitdb/__init__.py

@@ -12,14 +12,14 @@ def _init_externals():
     """Initialize external projects by putting them into the path"""
     for module in ('async', 'smmap'):
         sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', module))
-        
+
         try:
             __import__(module)
         except ImportError:
             raise ImportError("'%s' could not be imported, assure it is located in your PYTHONPATH" % module)
         #END verify import
     #END handel imports
-    
+
 #} END initialization
 
 _init_externals()
@@ -32,7 +32,6 @@ def _init_externals():
 
 
 # default imports
-from db import *
-from base import *
-from stream import *
-
+from gitdb.base import *
+from gitdb.db import *
+from gitdb.stream import *