Cleaned up trait snarl

Deleted extra file and reset the references to the actual traits
First fix/cleanup pass over VIET_Events
Merge pull request #26 from thefinestsieve/beta

More cleanup/fixing stuff!