Took out a missing file
Merge branch 'master' of https://github.com/wyvernlang/wyvern

Conflicts:
	tools/.classpath
Merge branch 'master' of https://github.com/wyvernlang/wyvern
Merge branch 'master' of https://github.com/wyvernlang/wyvern
Merge branch 'master' of https://github.com/wyvernlang/wyvern
Added test cases for simple classes, types, and metadata
Merge branch 'master' of https://github.com/wyvernlang/wyvern