Fixed imports for non-test files. Fixed other small mistakes. Removed confusing comment about testTrefoilSurgery in experimental.py (Problem has already been fixed).