Fix conflicts.
Merge pull request #67 from bigkevmcd/display-parameters

Display Job Parameters.