Merge remote-tracking branch 'origin/bundlepackages2' into modules
Merge branch 'modules' of github.com:xlevus/fabengine into modules
Tests now exit with return code 1 if they fail. Derp