Add missing encoding comments
Exclude all but one build from using ActiveModel 3
Merge branch 'master' into v2.0.0