add tags specs
Refactor tags
Merge branch 'master' into tagging

Conflicts:
	spec/models/tag_spec.rb