Fix spark-submit path in spark-shell & pyspark

Author: Neville Li <neville@spotify.com>

Closes #812 from nevillelyh/neville/v1.0 and squashes the following commits:

0dc33ed [Neville Li] Fix spark-submit path in pyspark
becec64 [Neville Li] Fix spark-submit path in spark-shell

bin/pyspark

@@ -27,7 +27,7 @@ SCALA_VERSION=2.10
 
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   echo "Usage: ./bin/pyspark [options]"
-  ./bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
+  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
   exit 0
 fi
 

bin/spark-shell

@@ -28,15 +28,15 @@ esac
 # Enter posix mode for bash
 set -o posix
 
+## Global script variables
+FWDIR="$(cd `dirname $0`/..; pwd)"
+
 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   echo "Usage: ./bin/spark-shell [options]"
-  ./bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
+  $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2
   exit 0
 fi
 
-## Global script variables
-FWDIR="$(cd `dirname $0`/..; pwd)"
-
 function main(){
     if $cygwin; then
         # Workaround for issue involving JLine and Cygwin