fix pep8 and pylint errors

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
Merge pull request #853 from edx/fix/adam/pylint-pep8

fix pep8 and pylint errors