Added Cobblestone and Stone, and many small fixes
Merge pull request #14 from mattparks/master

Added Cobblestone and Stone, and many small fixes