Merge pull request #13 from kdmurray91/dev

Make images go to image type subdirs in archive folder
[setup.py] v0.2.5 bump