Parser fixed, var decls moved accordingly
Merge branch 'parser_johan_syntax' of https://github.com/jhn/n2n into parser_johan_syntax