update locations
no longer at the BBP
prepare for talk in Lausanne
fix trailing whitespace