tag list
Merge branch 'master' of https://github.com/geronimod/ideas

Conflicts:
	app/controllers/ideas_controller.rb
	app/views/home/index.html.haml
	config/routes.rb