renamed all things tag to label (in case we want to use acts_as_taggable later)
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev