added Spork to speed up tests, minor updates