Revert "Revert "Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev""

This reverts commit 4415d8c4a1.

.travis.yml

@@ -4,7 +4,7 @@ env:
   global: 
     - EPANET_HOME=`pwd`
     - BUILD_HOME=buildprod
-    - TEST_HOME=tests/epanet-nrtestsuite
+    - TEST_HOME=nrtestsuite
 
 before_install:
   - sudo apt-get -qq update
@@ -26,5 +26,5 @@ script:
   # run regression tests
   - cd $EPANET_HOME
   - pip install -r tools/requirements.txt
-  - tools/gen-config.sh $EPANET_HOME/$BUILD_HOME/bin > $TEST_HOME/apps/epanet-$TRAVIS_COMMIT.json
+  - tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT
   - tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT