Fix #251 allow $ in content assist triggers.
Merge branch 'master' into dev