Pulled changes from dev/add.gif.support and cleaned up test cases
Testing only jpeg's currently
Wrote up case to handle jpeg's