* remove hg data repo
* pull the 6.002x repo

fixed the bug that you can enroll a course several times

Minor bug fix. Properly handles script tags where there are spaces before closing brace. 
Code is also more elegant than original. 
Note that this is not a security bug, as the fix indicated. 

Course start

Conflicts:
	common/djangoapps/student/views.py

edX caching

Dormsbee/portal display tweaks

Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now.

Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?)

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py

Dormsbee/portal display tweaks

Conflicts:
	lms/static/sass/application.css

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling

Ccp0101/capa pythonpath

Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code.

Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html

Add fixes to notes in #182