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

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

clean some stuff up
remove lines
Merge pull request #136 from ngoel36/stream

fix bugs in stream