Merge pull request #234 from mballance-sf/master

Merge updates and bugfix
Update for 1.3.3 release
Update for 1.3.4 release
Fix for #269 (NPE on Annotations preference page). Also initial work for
improved include content assist
Add initial support for index stats