Cleaning up the repo and adding the latest changes to master.