Feature: Option adding

Conflicts:
	coffee/lib/abstract-chosen.coffee