Added destory functions, empty trash, updated tests, other small refractoring
print syntax
moved find()
Doing a bit of a refactor of helper files.
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge remote-tracking branch 'refs/remotes/origin/master' into errorHandling

Conflicts:
	tests.py