Merge pull request #1 from erikcharlebois/master

Include symbol constituents in name regexps
Highlight @option tags

Added regexps for highlighting "@option hash [Type] key"-style tags,
with the hash as a variable-name-face and key as a constant-face.

Signed-off-by: Erik Charlebois <erik.charlebois@wishabi.com>