Improved handling of Quantities ar array_annotations further
Improved handling of Quantities ar array_annotations further

Had forgotten _merge_array_annotations in SpikeTrain

INM-6/python-neo,JuliaSprenger/python-neo,samuelgarcia/python-neo,rgerkin/python-neo,NeuralEnsemble/python-neo,apdavison/python-neo