working on argparse
Merge branch 'master' into argparse
Basic command-line interface. Closes #10.