Support contentName in grammars

PHP and other grammars have broken snippets because of the way `contentName` is handled in patterns that include both a `name` and `contentName` since only the `name` is used if both are present.

This PR adds support for `contentName` but including it in the scope stack.

Refs atom/language-php#3

Closes #3