Add XHP keywords to syntax

Also, remove HHVM keywords now that Hack is live.