Fix galaxy again.
Allow both mpl and PIL.
Keep swap_buffers for people using 0.1.0, which are most I think