switch order of auto-linking

public/javascripts/app/views/content_view.js

@@ -8,9 +8,9 @@ app.views.Content = app.views.StreamObject.extend({
     function metafyText(text) {
       //we want it to return at least a <p> from markdown
       text = text || ""
-      return mentionify(
+      return urlify(
+        mentionify(
           hashtagify(
-          urlify(
             markdownify(text)
           )
         )

spec/javascripts/app/views/post_view_spec.js

@@ -131,8 +131,8 @@ describe("app.views.Post", function(){
         links = ["http://google.com",
                  "https://joindiaspora.com",
                  "http://www.yahooligans.com",
-                 "obama.com",
-                 "japan.co.jp"]
+                 "http://obama.com",
+                 "http://japan.co.jp"]
 
         this.statusMessage.set({text : links.join(" ")})
         var view = new app.views.Post({model : this.statusMessage}).render();