Updating Develop Branch

Making sure the Develop branch matches the new changes in Master. I probably should have merged from @dejay's branch to my Develop branch instead of my Master branch, but this at least gets all the branches back into a good spot.