add setuptools egg for python2.7
Merge branch 'python2.7-support' into develop
upgrade to django 1.3.1
Updating sherd to its unstable head
Merge branch 'master' of git.ccnmtl.columbia.edu:mediathread into unstable

Conflicts:
	djangosherd/media/js/sherdjs
Remove project view ability from the collections list.
Fixing bug where username was not being picked up on the home page.
* Sizing nits
* Experimental Graph was broken. hs.js really needs to be 86'd
Updating help text for tags.
Merge branch 'django-1.3.1' into unstable
Merge branch 'unstable' of github.com:ccnmtl/mediathread into unstable
"disabling" respond, edit and links when the comment form is active. This solves a bunch of UI headaches.
Refining the discussion edit and response form "modality"
Merge branch 'unstable' of github.com:ccnmtl/mediathread into unstable
Fixing wonky situation where a Collaboration referenced a deleted underlying Threaded Comment object. Unsure how this came to pass, but it did, and broke Multimedia Blake.

This small defensive change should prevent this going forward.
Make username clickable so that the options menu opens.
Fix discussion opacity - need to account for all browsers.
Fixing bug where the tinyMCE panels were not resizable in discussions as intended. The trick is setting the tinymce settings to the proper value right before instantiation. There was some conflict between project not wanting resize & discussion wanting it.
Potpourri of issues:

* add_asset in assetmgr/views.py is a manual commit, which has caused all sorts of problems. Adding another band-aid and resolving to make this automatic. Interestingly, the tests broke over this.

* Updating sherdjs

* Making the video on the login page disappear when debugging (and running tests)

* Fixing homepage title