Auto merge of #35 - autrilla:uniforms, r=emilio …

Added remaining uniforms

bors-servo committed Apr 6, 2016