Making command-line options override ackrc options

This may be a bit fragile (it's hard for me to tell), but it gets all
the tests to pass. Also added test to make sure that the overrides work
both ways. Fixes #246, #266.