Clean up some code
Merge branch 'master'

Conflicts:
	app/controllers/links_controller.rb