De'opts' and de'id'fied

- term() is not needed anymore, using Id() and Opt() instead
Converted the rest of term() usage

- Everything is already supported
Fixed formatting
Merge pull request #17 from kobliha/opts_ids

Using Opt() and Id() instead of term(:opts) or term(:id)