Adjust terms, change references to 'master' to 'develop', fix links