Revert "Revert "stage 2 django1.7 deploy""

This reverts commit 3b03e7191da22c0855957926dec5e0489f60065c.