Renamed #label to #tag_label to resolve conflict with form helper
Merge pull request #586 from gzigzigzeo/master

Fixes #585