more cleanup
Merge branch 'master' of github.com:kevindavis/hackday.io

* 'master' of github.com:kevindavis/hackday.io:
  fix comments controller

Conflicts:
	app/controllers/comments_controller.rb