Fixed broken pyspark shell.

Author: Reynold Xin <rxin@apache.org>

Closes #444 from rxin/pyspark and squashes the following commits:

fc11356 [Reynold Xin] Made the PySpark shell version checking compatible with Python 2.6.
571830b [Reynold Xin] Fixed broken pyspark shell.

(cherry picked from commit 81a152c)
Signed-off-by: Reynold Xin <rxin@apache.org>

Author: rxin

python/pyspark/shell.py

@@ -22,7 +22,7 @@
 """
 
 import sys
-if sys.version_info.major != 2:
+if sys.version_info[0] != 2:
     print("Error: Default Python used is Python%s" % sys.version_info.major)
     print("\tSet env variable PYSPARK_PYTHON to Python2 binary and re-run it.")
     sys.exit(1)
@@ -53,7 +53,7 @@
     platform.python_version(),
     platform.python_build()[0],
     platform.python_build()[1]))
-    print("Spark context available as sc.")
+print("SparkContext available as sc.")
 
 if add_files != None:
     print("Adding files: [%s]" % ", ".join(add_files))