Merge pull request #280 from mballance-sf/master

Add support for multi-context content assist
More updates to support code template content assist