Changed references to MediaType to pull from javax.ws.rs.core.MediaType or com.fasterxml.jackson.jaxrs.smile.MediaType
Merge pull request #944 from metamx/MediaTypeFixes

Changed references to MediaType to use standard strings