Merge into master

Cleanup of Master, speeding up tests, fixing coveralls