Needed to update you to the latest dev

Dev just got a huge pull from our own development work. So I needed to update your branch with that. I fixed a conflict that arose from that.