Merge branch 'model_id_as' into gemfile

* model_id_as:
  Add "as Model::Id" to Windows#Account and Windows#Job