Correctly merging in changes from master

Will likely have to change a few files (like the readme and package.xml) afterwards