Auto merge of #32 - autrilla:Uniform4, r=emilio …

Added Uniform4i

Blocking servo/servo#10369

bors-servo committed Apr 2, 2016