Moving Getopt config to not be global

Really this should be done by using the Getopt::Long OO interface rather
than saving and re-pushing settings, but this fixes the tests and gets
us closer.