Fix uspto teamocil and some vim updates