Update versions to prepare for v2.1, fix formatting.