take out the trash
clean up dependencies
fix whitespace
clean up routes and such
Merge branch 'master' into cleanup

Conflicts:
	Gemfile
	app/controllers/comments_controller.rb
	app/controllers/reviews_controller.rb
	app/controllers/views_controller.rb
Merge pull request #128 from lukesteensen/cleanup

clean some stuff up