Ignore virtualenv env/ dirs
Don't filter incoming commits with checkfiles.
Resolved merge conflict.