Merging in bigbash's fixes

Gemfile.lock

@@ -13,6 +13,15 @@ GIT
     devise-mongo_mapper (0.0.1)
       devise (~> 1.1.0)
 
+GIT
+  remote: git://github.com/dcu/magent.git
+  revision: fe08cc6e9d4c1772035f84bcfb665d17b00ac625
+  specs:
+    magent (1.0.0)
+      em-websocket
+      mongo
+      uuidtools
+
 GIT
   remote: git://github.com/igrigorik/em-http-request.git
   revision: bf62d67fc72d6e701be5037e239dd470194b8e45
@@ -22,6 +31,16 @@ GIT
       addressable (>= 2.0.0)
       eventmachine (>= 0.12.9)
 
+GIT
+  remote: git://github.com/jnunemaker/mongomapper.git
+  revision: fd59b0ab068be7321f8e84b9dc12fb4fa6b8535d
+  branch: rails3
+  specs:
+    mongo_mapper (0.8.4)
+      activemodel (~> 3.0.0)
+      activesupport (~> 3.0.0)
+      plucky (~> 0.3.6)
+
 GIT
   remote: git://github.com/rsofaer/carrierwave.git
   revision: 9edb8bdddd2236742a85bfd7b260387498d01f88
@@ -47,25 +66,6 @@ GIT
       capistrano (>= 2.5.5)
       highline (>= 1.4.0)
 
-GIT
-  remote: http://github.com/dcu/magent.git
-  revision: 5d664351b305141158fc69fc495456414821adb3
-  specs:
-    magent (1.0.0)
-      em-websocket
-      mongo
-      uuidtools
-
-GIT
-  remote: http://github.com/jnunemaker/mongomapper.git
-  revision: fd59b0ab068be7321f8e84b9dc12fb4fa6b8535d
-  branch: rails3
-  specs:
-    mongo_mapper (0.8.4)
-      activemodel (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      plucky (~> 0.3.6)
-
 GEM
   remote: http://rubygems.org/
   specs:

public/stylesheets/application.css

@@ -195,8 +195,8 @@ li.message {
       li.message .content .from a {
         font-weight: bold; }
     li.message .content div.info {
-      color: #eeeeee;
-      font-size: 11px; }
+      color: #444444;
+      font-size: 14px; }
       li.message .content div.info a {
         color: #cccccc; }
       li.message .content div.info .time {