p4 grep tweaks
Fixed merge conflicts
Start using packages.  And elpy.