fixed #236 caused by me not resolving conflicts properly before
Internal method to return names of images in IMG_INFO
Merge remote-tracking branch 'upstream/master'
Added md5 and image size to image_info SQLite table
Added checks to auto_db to only include ewf if it was built with it
Merge pull request #237 from APriestman/master

Fixed more Yaffs2 bugs
removd filler entry for 0-sized YAFFS2 files
Merge remote-tracking branch 'upstream/master'
Finished adding config file support