Fix single dimension image resizing per #516, fix tests to close #322.
Merge branch 'master' of github.com:concerto/concerto