Fixed merge issues with Ryan, Kelly, and Tim's to master