Adding explicit 1NT support
de-indenting
Merge branch 'newmodules' into jeff-noah