clean up calendar identifier logic
Merge pull request #101 from stripe/jack-gregorian-calendar

Clean up calendar identifier logic