Fixed an issue where text coder would match for text/ml mime type  and getting ready for 8 and xcode 6
Fixed merge conflicts