rebase cleanup

Author: rnpridgeon

.gitignore

@@ -20,4 +20,5 @@ wheelhouse
 dl-*
 *.whl
 .pytest_cache
+staging
 docker/conf/tls/*

.travis.yml

@@ -64,8 +64,7 @@ install:
 script:
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then pip install -v --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" . .[avro] ; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then flake8 ; fi
- 
-# Make plugins available for tests
+ # Make plugins available for tests
  - ldd staging/libs/* || otool -L staging/libs/* || true
  - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "osx" ]]; then DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs py.test -v --timeout 20 --ignore=tmp-build --import-mode append ; fi
  - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "linux" ]]; then LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs py.test -v --timeout 20 --ignore=tmp-build --import-mode append ; fi