Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Prevent conflicting commands when specifying custom MEncoder options via renderer configs (part 1)
Prevent conflicting commands when specifying custom MEncoder options via renderer (part 2)

Also, add new renderer conf option TranscodedVideoAudioSampleRate
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into DirecTV