625 - mime resolution based on filetype rather than libmagic.
Merge branch '625-better-mime' of git://github.com/simong/Hilary into 625-better-mime
Documentation improvements