Skip installation of the OA XBlock if it's already installed
Merge pull request #348 from edx/will/speed-up-install-reqs

Skip installation of the OA XBlock if it's already installed
Merge branch 'master' into ai-grading

Conflicts:
	scripts/install-python.sh