Cleanup code
removed .pyc files
Merge branch 'tests'

Testing out the merging feature actually
minor edits to testfiles