Minor improvements to diagfrob.
Bugfix for p=2, Thm 4.10.
Add the case p=2 for elliptic curves.
Merge alpha_2 and alpha_p into alpha.