Revert "[Spark-1134] only call ipython if no arguments are given; remove IPYTHONOPTS from call"

This reverts commit afb5ea6.

Author: mateiz

bin/pyspark

@@ -55,9 +55,8 @@ if [ -n "$IPYTHON_OPTS" ]; then
   IPYTHON=1
 fi
 
-# Only use ipython if no command line arguments were provided [SPARK-1134]
-if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
-  exec ipython 
+if [[ "$IPYTHON" = "1" ]] ; then
+  exec ipython $IPYTHON_OPTS
 else
   exec "$PYSPARK_PYTHON" "$@"
 fi