Allow fay 0.21 and bump to 0.3.1