Added renderman shader metadata option "shaderTypeOverride".
For example : #pragma annotation "shaderTypeOverride" "ri:shader" will force the Gaffer shader type to "ri:shader".
Merge pull request #1135 from cedriclaunay/newPragmaOverrideShaderType

Cedric addressed John's requests, merging.