Merge branch 'master' into develop

 Conflicts:
	icekit/bin/pip-install.sh

icekit/bin/entrypoint.sh

@@ -79,13 +79,13 @@ fi
 export BASE_SETTINGS_MODULE="${BASE_SETTINGS_MODULE:-develop}"
 
 # Get number of CPU cores, so we know how many processes to run.
-export CPU_CORES=$(python -c 'import multiprocessing; print multiprocessing.cpu_count();')
+export CPU_CORES=$(python -c "import multiprocessing, sys; sys.stdout.write('%s\n' % multiprocessing.cpu_count());")
 
 # Place GPG home directory in project directory.
 export GNUPGHOME="$ICEKIT_PROJECT_DIR/.gnupg"
 
 # Get absolute directory for the `icekit` package.
-export ICEKIT_DIR=$(python -c 'import icekit, os; print os.path.abspath(os.path.dirname(icekit.__file__));')
+export ICEKIT_DIR=$(python -c "import icekit, os, sys; sys.stdout.write('%s\n' % os.path.dirname(icekit.__file__));")
 
 # Get project name from the project directory.
 export ICEKIT_PROJECT_NAME=$(basename "$ICEKIT_PROJECT_DIR")

icekit/bin/pip-install.sh

@@ -16,15 +16,15 @@ cd "$DIR"
 if [[ -f requirements.txt ]]; then
 	if [[ ! -s requirements.txt.md5 ]] || ! md5sum --status -c requirements.txt.md5 > /dev/null 2>&1; then
 		echo "Python requirements in '$DIR' directory are out of date, 'requirements.txt' has been updated."
-		pip install -r requirements.txt
+        python -m pip install -r requirements.txt
 		md5sum requirements.txt > requirements.txt.md5
 	fi
 fi
 
 if [[ -f requirements-local.txt ]]; then
 	if [[ ! -s requirements-local.txt.md5 ]] || ! md5sum --status -c requirements-local.txt.md5 > /dev/null 2>&1; then
 		echo "Python requirements in '$DIR' directory are out of date, 'requirements-local.txt' has been updated."
-		pip install -r requirements-local.txt
+        python -m pip install -r requirements-local.txt
 		md5sum requirements-local.txt > requirements-local.txt.md5
 	fi
 fi

project_template/go.sh

@@ -29,7 +29,7 @@ if [[ -z $("$ICEKIT_VENV/bin/python" -m pip freeze | grep django-icekit) ]]; the
 fi
 
 # Get absolute directory for the `icekit` package.
-export ICEKIT_DIR=$("$ICEKIT_VENV/bin/python" -c 'from __future__ import print_function; import icekit, os; print(os.path.dirname(icekit.__file__));')
+export ICEKIT_DIR=$("$ICEKIT_VENV/bin/python" -c "import icekit, os, sys; sys.stdout.write('%s\n' % os.path.dirname(icekit.__file__));")
 
 # Execute entrypoint and command.
 exec "$ICEKIT_DIR/bin/entrypoint.sh" ${@:-setup-django.sh bash.sh}