scalastyle checks for sbt. All warnings for now. Execute using 'sbt scalastyle'
Merge branch 'master' of github.com:amplab/shark into ampmaster
Warnings now errors. Disabled cyclomatic complexity
Rebase to 'master' of github.com:amplab/shark

Conflicts:
	project/SharkBuild.scala
Style fixups across all code after the introduction of scalastyle style checker tool.
Merge branch 'scalastyle' of github.com:junkumar/shark into clean

Conflicts:
	project/SharkBuild.scala
	src/main/scala/shark/SharkConfVars.scala
	src/main/scala/shark/execution/CommonJoinOperator.scala
	src/main/scala/shark/execution/EmptyRDD.scala
	src/main/scala/shark/execution/MapJoinOperator.scala
	src/main/scala/shark/execution/ReduceKey.scala
	src/main/scala/shark/execution/ReduceSinkOperator.scala
	src/main/scala/shark/execution/serialization/HiveConfSerializer.scala
	src/main/scala/shark/parse/SharkSemanticAnalyzer.scala
Force user specified hadoop dependency.
Addressed Harvey's comment.
Merge pull request #205 from rxin/clean

Merging Nandu's style cleanup pull request.
Merge pull request #207 from rxin/build

Force user specified Hadoop dependency.