Adding some optparse goodness to make command line discovery nicer