optional image parameter to sizing functions.
default colorbox options for basic[sic] theme
Merge remote-tracking branch 'origin/master' into fixing-quotes
Merge branch 'fixing-quotes' of https://github.com/zenphoto/zenphoto into fixing-quotes