Merge pull request #40 from wolberd/gallery2plus

Pulled Dave's code
Merge pull request #15 from karuto/gallerydev

Merge pull request #40 from wolberd/gallery2plus