refactor to put "report_input" a conf option instead of cli option

Previously, the --report_input option was something you had to pass in via conf
file. This disabled SSH syncing as a side effect, which was confusing if you
were syncing from multiple satellites.

Instead, set "type=file" in the config file, which allows use of both SSH and
file syncing at the same time.
Rework unit tests to make them order independent

The mock config dictonary gives different results based on how the dict is
iterated over. The tests need to be more robust against different run orders.
Merge pull request #7 from beav/option-combine

refactor to put "report_input" a conf option instead of cli option