Add fromJSON implementation to EventType

- Added complete fromJSON implementation.
    This was mostly matching ids to eventType. I'm not sure using enums
    here is the best choice, but it'll do for now. Might make it a
    hassle later. Defaults to other for now.
- Some minor eclipsian cleanup of code