updated tests; token concatenation now works; fixes a macro expansion bug
Merge branch 'master' of https://github.com/nimrod-code/c2nim