fixed misc formatting and small problems
Merge pull request #11 from hammerlab/mutually_exclusive_inputs

fixed misc formatting and small problems