diff --git a/.travis.yml b/.travis.yml
index d43ddbb4263197ee8877ee38c18a118c803f47c8..0b826c315b990e4a63b1082c4d87f5fcfc1f8550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ branches:
   only:
     - 'master'
 
-
 rvm:
   - 1.8.7
   - ree
diff --git a/config/routes.rb b/config/routes.rb
index 0c3e44237ab8963f9cd7e99745d9316e8dc5a2ad..f0abaf08cbb026612921224b11d35a76390aa0df 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -168,6 +168,7 @@ Diaspora::Application.routes.draw do
   namespace :api do
     namespace :v0 do
       get "/users/:username" => 'users#show', :as => 'user'
+      get "/tags/:name" => 'tags#show', :as => 'tag'
     end
   end
 
diff --git a/lib/stream/base.rb b/lib/stream/base.rb
index 81f78e39e4f38f902c8c9645e72f7ae13cdb4916..5717ea32974355e937002f8ca91c8dcbf982ab55 100644
--- a/lib/stream/base.rb
+++ b/lib/stream/base.rb
@@ -120,7 +120,7 @@ class Stream::Base
   def post_is_from_contact?(post)
     @can_comment_cache ||= {}
     @can_comment_cache[post.id] ||= contacts_in_stream.find{|contact| contact.person_id == post.author.id}.present?
-    @can_comment_cache[post.id] ||= user.person.id == post.author.id
+    @can_comment_cache[post.id] ||= (user.person.id == post.author.id)
     @can_comment_cache[post.id]
   end
 end
diff --git a/spec/lib/stream/base_spec.rb b/spec/lib/stream/base_spec.rb
index f901a8d2b1a812069178735586082b6f41583ba4..182627708f9a15a2c5591c030a324c907bd90b10 100644
--- a/spec/lib/stream/base_spec.rb
+++ b/spec/lib/stream/base_spec.rb
@@ -11,22 +11,22 @@ describe Stream::Base do
       @stream.stub(:people).and_return([bob.person, eve.person, @person])
     end
 
-    it 'returns true if user is a contact of the post author' do
+    it 'allows me to comment on my local contacts post' do
       post = Factory(:status_message, :author => bob.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if a user is the author of the post' do
+    it 'allows me to comment on my own post' do
       post = Factory(:status_message, :author => alice.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if the author of the post is local' do
+    it 'allows me to comment on any local public post' do
       post = Factory(:status_message, :author => eve.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if person is remote and is a contact' do
+    it 'allows me to comment on a remote contacts post' do
       Contact.create!(:user => @stream.user, :person => @person)
       post = Factory(:status_message, :author => @person)
       @stream.can_comment?(post).should be_true