[ENH] clean up option machinery
Merge pull request #37 from htkm/enh/entry-point-and-option

[ENH] clean up option machinery