Change TYPE and ROWTYPE, Adjust Type Capture

Added the % to the beginning of TYPE and ROWTYPE. Changed TYPE capture
to correctly match entity name.
Merge remote-tracking branch 'origin/missing-keywords'
Merge pull request #10 from jpangborn/master

Fix #9 Type Capture