V2.1.0

Can we merge in this branch to master? I would like to start committing some of the changes the interns have made and I want to branch off of master before I do it.