Quick storyboard/collage photo tool

Does anyone know of a program besides using Photoshop/template to quickly take images and organize them into a storyboard/collage. I would prefer something local and with some controls over the whitespace and to reorder the boxes to different layouts.

Here's what I'm looking for but with a Photoshop template:

http://www.gingerpixel.com/review/storyboard-templates/