Updating master to new baseline

master now includes PJ's changes (lava, red bricks, etc)