Ensure conditionals do not break on reserved words
Merge pull request #37 from tbranyen/conditional-reserved

Ensure conditionals do not break on reserved words