Updated Ident FSA
Stephen's NonTerms stubs
Merge pull request #7 from darkshark007/master

Stephen's NonTerms stubs