Fix

Conflicts:
	lib/jetpeg/parser.rb
More cleanup.