Disabled simplification for now.
Adding basic support for Travis.
Reduced noise magnitude in test.
Merge branch 'master' into simplification.
More work on getting simplification right.
Yet more work on getting simplification right.