Arguments

Added some basic command line options for running, and fixed another
pickling problem.