Add django_diazo and themes
Merge branch 'master' of https://github.com/jean/geonode_buildout
Resolved conflicts, merged local work