Merge remote branch 'spencerlyon2/options'

* spencerlyon2/options:
  Moved line to be pep8 compliant
  Restored the options to TextParser. They got removed on a copy/paste from my local test file and I just caught it
  BUG: Small bug in helper functions _unpack and _parse_options_data
  Updated options data file

Author: wesm