Merge pull request #1 from m3talsmith/master

Merge config options on setup
package.json merge conflict resolved
,
starting the test suite
passes config.env