Merge pull request #248 from mballance-sf/master

More bug fixes and updates to the 'new' indexer
Merge pull request #249 from mballance-sf/master

Bugfixes and updates for 1.3.9
Update for 1.4.0 release