add some command-line options
Merge pull request #169 from ENCODE-DCC/1225-merry-xmas

add some command-line options