Changed the way parameters to mainsearch are held and used
Merge branch 'gqdev' of http://github.com/gquere/ngp into gqdev
TOSQUASH: Updated usage()