improvements to hphp/tools/out2expectf.py

Summary: I found these changes in my tree on my old devserver and I think they're good to have

Reviewed By: @JoelMarcey

Differential Revision: D1581913