Bump version and fold in changes for 0.2.1 release