Merge pull request #276 from mballance-sf/master

Content-assist updates and bug fix
Correct a compile bug
Merge pull request #277 from mballance-sf/master

- #(enh 80) - Add support for code completion of hierarchical references that use macros
Merge remote-tracking branch 'upstream/master'