Prepped the parser for the new AST
Merge branches 'master' and 'feature/ParseReturns'