mostly submodule updates
Resolving merge conflicts
Removed w2p virtualenv directory accidentally included