Bump API version to 21
Update contributing guidelines