Honey Updates

Update IsLava rendering logic to also include IsHoney, and misc
Settings.xml color updates.
Update drawing code to include honey
Settings.xml formatting change.
Settings.xml Conflict resolution

Pulled latest Settings.xml and resolved conflicts.
Settings.xml Extra spaces to align tags
Resolve conflicts from @RIonRyan's last commit.
More conflict resolution
And some more conflict resolution.
Merge pull request #404 from NeilWhite/HoneyRendering

Honey Updates