Finishing up: cleaned up comments. Removed stuff from tabs.py.
Merge branch 'csvoss/badges' of github.com:edx/edx-platform into csvoss/badges

Conflicts:
	lms/djangoapps/courseware/tabs.py