Bug 980351 consolidating our requirements and virtualenv woes

@lonnen r?