Added Boolean and String reserved words

Cleaned up parser rule numbers