Jpeg2k

Omnibus branch of #576 merged with #547, should merge cleanly with master.