Trimmers are for nose hair, not expressions

Removed the trimmer and all references to it.
Merge branch 'no-trimmer'

Conflicts:
	src/Expression.java