Replaced optparse with argparse
Fixed watchlist id definition

1. value of id should default to None so logic to test if id var is
being passed in works correctly.
2. condensed request dict definition to one line