Merge pull request #22 from velour/dev/eaburns

Fix some parser issues.
Add spec parser tests up to function types.