Update make-index.pl for new layout
Merge latest Travis build into my local build.