thumbnails - update img, refs opengeo/mapstory#516
fix org trailing slash, refs#560
Merge branch 'vanity-pages' into integration
Merge branch 'master' into integration