fix a problem with permalinks
add tagging
Merge branch 'simplified-tagging'

Conflicts:
	app/assets/stylesheets/forms.scss
	app/controllers/snippets_controller.rb