More updates to support code template content assist
Merge pull request #281 from mballance-sf/master

More updates to support code template content assist