deploy.py and some assets.py
Merge branch 'feature/msteele/pave' of github.com:edx/edx-platform into feature/msteele/pave
deploy.py