Changes to team page, merged FTfellows and visiting into faculty and added Rocio