Rremoving "two-mode-mode" code because it is buggy, out of date, and not very helpful anymore.
Merge pull request #80 from mrd/master

Rremoving "two-mode-mode" code because it is buggy, out of date, and not...