diff --git a/Gemfile b/Gemfile
index 61e62db70..db874839e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 #ruby=1.9.3
 source 'https://rubygems.org'
-source 'https://jamjam:blueberryjam@www.jamkazam.com/gems/'
+#source 'https://jamjam:blueberryjam@www.jamkazam.com/gems/'
 
 # Look for $WORKSPACE, otherwise use "workspace" as dev path.
 workspace = ENV["WORKSPACE"] || "~/workspace"
diff --git a/spec/jam_ruby/models/music_session_spec.rb b/spec/jam_ruby/models/music_session_spec.rb
index 14102445c..6745f1512 100644
--- a/spec/jam_ruby/models/music_session_spec.rb
+++ b/spec/jam_ruby/models/music_session_spec.rb
@@ -78,6 +78,34 @@ describe MusicSession do
     music_session.can_see?(user3).should == false
   end
 
+
+  it "orders two sessions by created_at starting with most recent" do
+    creator = FactoryGirl.create(:user)
+    earlier_session = FactoryGirl.create(:music_session, :creator => creator, :description => "Earlier Session")
+    later_session = FactoryGirl.create(:music_session, :creator => creator, :description => "Later Session")
+
+    user = FactoryGirl.create(:user)
+
+    music_sessions = MusicSession.index(user)
+    music_sessions.length.should == 2
+    music_sessions.first.id.should == later_session.id
+  end
+
+
+  it "orders sessions with friends first, even if created first" do
+    creator1 = FactoryGirl.create(:user)
+    creator2 = FactoryGirl.create(:user)
+    earlier_session = FactoryGirl.create(:music_session, :creator => creator1, :description => "Earlier Session")
+    later_session = FactoryGirl.create(:music_session, :creator => creator2, :description => "Later Session")
+    user = FactoryGirl.create(:user)
+    FactoryGirl.create(:friendship, :user => creator1, :friend => user)
+    FactoryGirl.create(:friendship, :user => user, :friend => creator1)
+
+    music_sessions = MusicSession.index(user)
+    music_sessions.length.should == 2
+    music_sessions.first.id.should == earlier_session.id
+  end
+
   it 'can list sessions with appropriate sort order' do
 
     user1 = FactoryGirl.create(:user)