Added threshold parsing for input devices
Touch ups
Additional options added to form
Motors added to output list
Motors can be tied to Devices
Changed file names
Cleanup for merge conflict
More conflict fixes
Formatting changes
Yet more merge fixes - works for real this time
Merge pull request #9 from mclyde/mattlocal1

Mattlocal1