Merge branch 'master' into add_preprocess_action - avoid rebase

.travis.yml

@@ -14,14 +14,16 @@ install:
        brew install cartr/qt4/qt 
        ;
     fi
-  - sudo pip install nose numpy
+  - sudo -H pip install nose numpy
 os:
   - linux
   - osx
 compiler:
   - clang
   - gcc
+env:
+  - PYTHONPATH="."
 script:
   - mkdir build && cd build
   - cmake -DCMAKE_BUILD_TYPE=RelwithDebInfo .. && make -j4 && make install
-  - cd .. && nosetests --exe
+  - cd .. && pip install --user . && nosetests --exe tests/test_basic.py

__init__.py

-from hfo_py.hfo import *
+try:
+  from hfo_py.hfo import *
+except ImportError:
+  from hfo import *
+
 import os
 
 def get_hfo_path():