Commit for the night

@Calclavia @Alex-hawks I am having trouble making it so the different
colors of painted wires don't connect :/ i cant get it workin
Merge branch 'master' of git://github.com/Mattredsox/Electric-Expansion
relocate textures