Added new functionality
Merge branch 'master' of https://github.com/bluebear94/amethyst

Conflicts:
	.cache
Wrote equals methods for types; replaced the ifThenElse monster with
something nicer