making stuff neater
Merge branch 'master' of git://github.com/Mattredsox/Electric-Expansion
Merge branch 'master' of git://github.com/Mattredsox/Electric-Expansion
relocate textures