Merged from brian_branch; md5 seems to be working

Merged over from brian_branch

MD5 stuff seems to work now. Probably need to test to make sure it
doesn't interfere with other stuff.