replaced "-hiveconf" with "--hiveconf" as the current spark-sql does not accept the former any more (but hive accepts the latter), some initial adjustments for spark-sql
replaced shark related stuff with spark
corrected typo in setEnvVars
renamed sharkSettings to sparkSettings