Percolator/percolator to jfnavarro/percolator

Pull request to update my fork of percolator with the last changes in the master branch.