Changes on stage2 of deploy: merged in django and mezzanine infra + renamed things