The Big Picture (version 2)

Thanks to everyone who gave us feedback on the first version of a concept map for Software Carpentry. The second version is shown below, along with a list of terms that ought to be on it, but aren't. Where would you place them, and how would they connect to each other and to the concepts that are already linked?