Merge pull request #46 from massiveinteractive/haxe-3-macro-compatability

Some Haxe 3 tink.macro compatability fixes