s/options/choices/ for argparse
Merge pull request #172 from coryb/testing

s/options/choices/ for argparse