making instance filter tags work
Merge branch 'master' of github.com:/lreeves/aws_watch

Conflicts:
	app/models/instance_filter.rb
	app/views/instance_filters/edit.html.erb