even better resizing; just reload the damned colorbox!
Merge branch 'master' into gh-pages