Initial pass at using typesafe's conf object for handling configuration options
Added defaults file
Existing tests now work
Existing tests now work
Created mergedPropertyMap
Moved sparkSubmitArguments module to use custom property map merging code
Merge branch 'master' of https://github.com/apache/spark
note for additional tests
Changes needed to pass scalastyle check
Changes needed to pass scalastyle check, merged from current SparkSubmit.scala
Fixed some typos