Merge pull request #2 from warlordjones/master

Made the contribution instructions more universal
Start of voidstone
Merge remote-tracking branch 'origin/master'
Names are now in as well as textures
more sterf
Merge pull request #1 from TheCricket/master

Merge Cricket's recent changes