Merge

Fixing David's rouge migration + updating with master. Merge conflict was with requirements.txt.

All tests pass.