Pinning dependencies, attempt 2

Remove duplicate dependencies between dev and regular, and pin deps of deps in the dev_requirements file too in an attempt to fix the dev vm.

Update:  great, this breaks jenkins.  :|