Remove network calls in tests
Stylistic changes
Merge branch 'master' into lapentab/fix_network_tests

Conflicts:
	lms/djangoapps/courseware/tests/tests.py
Merge pull request #773 from edx/lapentab/fix_network_tests

Remove network calls in tests