bgallagher, your fix has help me out to, but now have the issue of getting the image layout bits included.
eg. [gallery columns="4" orderby="title"] & [gallery type='flickr' user_id='98326023@N07' view='photosets' photoset_id='72157639352499826' columns='3' tag_mode='any' sort='date-posted-desc']
