tags update
Merge branch 'master' into tony

Conflicts:
	app/views/tags/new.html.erb
Merge branch 'master' into tony
fix delete on update and create
comment out unecessary param fields
fix indentation on views
fix edit view
undo refactor