Update requirements to latest versions (sans django 1.5.x, which requires modification and testing).  Removed elementtree, as the version we were using has disappeared from pypi.
reverting to django-cms 2.3.6
Merging from feature/requirements-update