Allow field to be used in shortcode in other cases

If someone tries to use:
[pods name="podname" where="t.somthing = 'else'" field="test"]
it won't work, although this does work
[pods name="podname" where="t.somthing = 'else'"]{@test}[/pods]

I understand why they work differently but I don't see a reason not to allow this usage.

This really is an ugly diff, it looks like a lot was changed but all that happened was to move the last elseif block up and change the former elseif on field to an if.