Merge pull request #172 from mballance-sf/master

Content-assist organization updates
Update for 1.1.4 release
Improve performance of macro processing with many macro refs