Fix failing integration tests
Revert "Drop travis-merge call"

This reverts commit 6d4fd376cf7746c1811b37a05c88603dc7d6571b.
Restore git configuration section in .travis.yml
Move `python setup.py ...` call at the end of the Travis script
merge master -D org -I include -E exclude: PR 102 (95 packaging)