Honey Updates

Update IsLava rendering logic to also include IsHoney, and misc
Settings.xml color updates.
Update drawing code to include honey
Tweaks
Remind me not to take on hand formatting a file like this again.
Settings.xml formatting change.
Settings.xml Conflict resolution

Pulled latest Settings.xml and resolved conflicts.
Settings.xml Extra spaces to align tags
Wall that was fun!

Still not happy with the ice block color....

Oh and wall #80 seems to have something wrong with it...
It looks identical to the mushroom wall...

Oh wall...
Work around for crash saving a new world

Attempting to save a world where not all NPC's have been named causes an
exception.

This is due to the the FixNPCs() function of World.cs being an
Asynchronous call, meaning the save function potentially accesses the
CharacterNames collection before the Fix has taken place. This
workaround makes sure new worlds have all characters added.
Merge Settings.xml in from BinaryConstruct/master