Variable name fix

This change adds a fix for variable names which contain underscores.

Previously '_' were incorrectly treated as words, so word navigation: <kbd>M-f</kbd> & <kbd>M-b</kbd> would incorrectly jump over, partially or completely, over the variables with underscores in their names.

Most of the discussion that went about this change can be found under this issue: #265