SPARK-1109 wrong API docs for pyspark map function

Author: Prashant Sharma <prashant.s@imaginea.com>

Closes #73 from ScrapCodes/SPARK-1109/wrong-API-docs and squashes the following commits:

1a55b58 [Prashant Sharma] SPARK-1109 wrong API docs for pyspark map function

(cherry picked from commit 02836657cfec50bc6cc357541e40f8d36c90b352)
Signed-off-by: Matei Zaharia <matei@databricks.com>
SPARK-1184: Update the distribution tar.gz to include spark-assembly jar

See JIRA for details.

Author: Mark Grover <mark@apache.org>

Closes #78 from markgrover/SPARK-1184 and squashes the following commits:

12b78e6 [Mark Grover] SPARK-1184: Update the distribution tar.gz to include spark-assembly jar
(cherry picked from commit cda381f88cc03340fdf7b2d681699babbae2a56e)

Conflicts:

	assembly/pom.xml