Fix for #269 (NPE on Annotations preference page). Also initial work for
improved include content assist
Add initial support for index stats
Merge pull request #235 from mballance-sf/master

Bug fixes and initial index-stats support