Cleanup of installation and upgrade to django 1.4.5
Fixed merge conflict with buildout