Take in Travis's changes to my personal repo