Bug 980351 consolidating our requirements and virtualenv woes (DO NOT MERGE)

work in progress