Merge pull request #376 from bepetersn/v2.0-dev

attempt to fix #375; also update an old test
update location of reqs.txt in v2 deploy script