Crashing everything
Restored build
Cleaning up setUp
Improved speculation tests
No need for self in tests
Merge branch 'master' into faster-tests

Conflicts:
	website/tests.py
Final cleanup
Merge pull request #38 from Neamar/faster-tests

Faster tests