Pin down buildout version in Makefile
Update dependency versions
Bump Django version to >1.4,<1.5
Merge branch 'update-packages' into develop