Stop errors when DICOM data types are wrong and gdcmdump output changes

Also reconfigured protocol / series description naming usage to avoid redundancy.
Will now attempt to name series as the concatenation of unique text in protocol
name / series description.

We were previously doing this for DTI, eg if we had

protocol = A_DTI_PROTOCOL
seriesDesc = A_DTI_PROTOCOL_FA

we'd name the output XXXX_A_DTI_PROTOCOL_FA

where XXXX is the series number. But if we had

protocol = A_T1_PROTOCOL
seriesDesc = T1_PROTOCOL

the output would be

XXXX_A_T1_PROTOCOL_T1_PROTOCOL

Now it would be

XXXX_A_T1_PROTOCOL
Merge remote-tracking branch 'origin/master'