Updated test data and Makefile to reflect newer marci2isis output format and...

Updated test data and Makefile to reflect newer marci2isis output format and marcical expectations. 
Also fixed the filename of the input test data to better reflect its origins.




git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6004 41f8697f-d340-4b68-9986-7bafba869bb8