consistency issues
Merge branch 'master' of github.com:paranoidgabe/TerrainGenerator