Slowly bring in changes from geonode 2.0, add test dependencies to requirements.txt