Highlight only uppercase words

This was highlighting all uppercase letters, even those in CamelCase words. It now looks for only full uppercase words.