Terbs Week of Fun: Day 1: Ghost Chilis

Random commit reordering the changelog that I forgot about. See commit log for more details. 

Please merge ASAP.