first push to new master which will add acts-as-taggable gem