Added magit-find-file.
Resolved conflicts between cedet and iasm.