Cleaning up my mess from a previous merge.... I'm a git/hub newbie.