Fold in changes
Bump version to 0.2.3 and update soledad server dependency