diff --git a/Gemfile.lock b/Gemfile.lock
index bd4190fe3..2860bb168 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,10 +39,10 @@ GIT
 
 GIT
   remote: git://github.com/jnunemaker/mongomapper.git
-  revision: b24db29c236f239d6a5a821fb6a444430e89f9d6
+  revision: 9f22809a04f13b37db9078371a524aff67fafd70
   branch: rails3
   specs:
-    mongo_mapper (0.8.4)
+    mongo_mapper (0.8.6)
       activemodel (~> 3.0.0)
       activesupport (~> 3.0.0)
       plucky (~> 0.3.6)
@@ -108,7 +108,7 @@ GEM
     addressable (2.2.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    aws (2.3.24)
+    aws (2.3.25)
       activesupport
       http_connection
       uuidtools
@@ -148,7 +148,7 @@ GEM
       uuidtools
     childprocess (0.1.3)
       ffi (~> 0.6.3)
-    columnize (0.3.1)
+    columnize (0.3.2)
     configuration (1.1.0)
     crack (0.1.8)
     cucumber (0.9.3)
@@ -229,7 +229,7 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    multi_json (0.0.4)
+    multi_json (0.0.5)
     multipart-post (1.0.1)
     net-ldap (0.1.1)
     net-scp (1.0.4)
@@ -323,10 +323,10 @@ GEM
       rspec-expectations (~> 2.0.1)
     rspec-rails (2.0.1)
       rspec (~> 2.0.0)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
@@ -348,7 +348,7 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.3)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     twitter (0.9.12)
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index b2ba0f4c9..211b2033f 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -2,9 +2,9 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
+= javascript_include_tag 'vendor/FABridge', 'vendor/swfobject', 'vendor/web_socket'
 :javascript
-  WebSocket.__swfLocation = "#{javascript_path 'WebSocketMain.swf'}";
+  WebSocket.__swfLocation = "#{javascript_path 'vendor/WebSocketMain.swf'}";
   $(document).ready(function(){
     function debug(str){ $("#debug").append("<p>" +  str); };
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e4ee651b6..1b4252784 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,20 +14,20 @@
     = stylesheet_link_tag "blueprint/print", :media => 'print'
 
     = stylesheet_link_tag "application", "ui"
-    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
-    = stylesheet_link_tag "fileuploader"
-    = stylesheet_link_tag "tipsy"
+    = stylesheet_link_tag "vendor/jquery.fancybox-1.3.1"
+    = stylesheet_link_tag "vendor/fileuploader"
+    = stylesheet_link_tag "vendor/tipsy"
 
     - if current_user
       %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"}
     
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery-1.4.2.min', 'rails'
-    = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
-    = javascript_include_tag 'jquery.tipsy'
+    = javascript_include_tag 'vendor/jquery-1.4.2.min', 'rails'
+    = javascript_include_tag 'vendor/jquery.infieldlabel', 'vendor/jquery.cycle/jquery.cycle.min.js'
+    = javascript_include_tag 'vendor/jquery.tipsy'
 
-    = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
-    = javascript_include_tag 'fileuploader'
+    = javascript_include_tag 'vendor/fancybox/jquery.fancybox-1.3.1.pack'
+    = javascript_include_tag 'vendor/fileuploader'
 
     = javascript_include_tag 'view', 'image_picker', 'stream'
 
diff --git a/public/javascripts/FABridge.js b/public/javascripts/vendor/FABridge.js
similarity index 100%
rename from public/javascripts/FABridge.js
rename to public/javascripts/vendor/FABridge.js
diff --git a/public/javascripts/WebSocketMain.swf b/public/javascripts/vendor/WebSocketMain.swf
similarity index 100%
rename from public/javascripts/WebSocketMain.swf
rename to public/javascripts/vendor/WebSocketMain.swf
diff --git a/public/javascripts/fancybox/blank.gif b/public/javascripts/vendor/fancybox/blank.gif
similarity index 100%
rename from public/javascripts/fancybox/blank.gif
rename to public/javascripts/vendor/fancybox/blank.gif
diff --git a/public/javascripts/fancybox/fancy_close.png b/public/javascripts/vendor/fancybox/fancy_close.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_close.png
rename to public/javascripts/vendor/fancybox/fancy_close.png
diff --git a/public/javascripts/fancybox/fancy_loading.png b/public/javascripts/vendor/fancybox/fancy_loading.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_loading.png
rename to public/javascripts/vendor/fancybox/fancy_loading.png
diff --git a/public/javascripts/fancybox/fancy_nav_left.png b/public/javascripts/vendor/fancybox/fancy_nav_left.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_nav_left.png
rename to public/javascripts/vendor/fancybox/fancy_nav_left.png
diff --git a/public/javascripts/fancybox/fancy_nav_right.png b/public/javascripts/vendor/fancybox/fancy_nav_right.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_nav_right.png
rename to public/javascripts/vendor/fancybox/fancy_nav_right.png
diff --git a/public/javascripts/fancybox/fancy_shadow_e.png b/public/javascripts/vendor/fancybox/fancy_shadow_e.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_e.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_e.png
diff --git a/public/javascripts/fancybox/fancy_shadow_n.png b/public/javascripts/vendor/fancybox/fancy_shadow_n.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_n.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_n.png
diff --git a/public/javascripts/fancybox/fancy_shadow_ne.png b/public/javascripts/vendor/fancybox/fancy_shadow_ne.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_ne.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_ne.png
diff --git a/public/javascripts/fancybox/fancy_shadow_nw.png b/public/javascripts/vendor/fancybox/fancy_shadow_nw.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_nw.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_nw.png
diff --git a/public/javascripts/fancybox/fancy_shadow_s.png b/public/javascripts/vendor/fancybox/fancy_shadow_s.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_s.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_s.png
diff --git a/public/javascripts/fancybox/fancy_shadow_se.png b/public/javascripts/vendor/fancybox/fancy_shadow_se.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_se.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_se.png
diff --git a/public/javascripts/fancybox/fancy_shadow_sw.png b/public/javascripts/vendor/fancybox/fancy_shadow_sw.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_sw.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_sw.png
diff --git a/public/javascripts/fancybox/fancy_shadow_w.png b/public/javascripts/vendor/fancybox/fancy_shadow_w.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_shadow_w.png
rename to public/javascripts/vendor/fancybox/fancy_shadow_w.png
diff --git a/public/javascripts/fancybox/fancy_title_left.png b/public/javascripts/vendor/fancybox/fancy_title_left.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_title_left.png
rename to public/javascripts/vendor/fancybox/fancy_title_left.png
diff --git a/public/javascripts/fancybox/fancy_title_main.png b/public/javascripts/vendor/fancybox/fancy_title_main.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_title_main.png
rename to public/javascripts/vendor/fancybox/fancy_title_main.png
diff --git a/public/javascripts/fancybox/fancy_title_over.png b/public/javascripts/vendor/fancybox/fancy_title_over.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_title_over.png
rename to public/javascripts/vendor/fancybox/fancy_title_over.png
diff --git a/public/javascripts/fancybox/fancy_title_right.png b/public/javascripts/vendor/fancybox/fancy_title_right.png
similarity index 100%
rename from public/javascripts/fancybox/fancy_title_right.png
rename to public/javascripts/vendor/fancybox/fancy_title_right.png
diff --git a/public/javascripts/fancybox/fancybox-x.png b/public/javascripts/vendor/fancybox/fancybox-x.png
similarity index 100%
rename from public/javascripts/fancybox/fancybox-x.png
rename to public/javascripts/vendor/fancybox/fancybox-x.png
diff --git a/public/javascripts/fancybox/fancybox-y.png b/public/javascripts/vendor/fancybox/fancybox-y.png
similarity index 100%
rename from public/javascripts/fancybox/fancybox-y.png
rename to public/javascripts/vendor/fancybox/fancybox-y.png
diff --git a/public/javascripts/fancybox/fancybox.png b/public/javascripts/vendor/fancybox/fancybox.png
similarity index 100%
rename from public/javascripts/fancybox/fancybox.png
rename to public/javascripts/vendor/fancybox/fancybox.png
diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/vendor/fancybox/jquery.easing-1.3.pack.js
similarity index 100%
rename from public/javascripts/fancybox/jquery.easing-1.3.pack.js
rename to public/javascripts/vendor/fancybox/jquery.easing-1.3.pack.js
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.js
similarity index 100%
rename from public/javascripts/fancybox/jquery.fancybox-1.3.1.js
rename to public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.js
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.pack.js
similarity index 100%
rename from public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
rename to public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.pack.js
diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/vendor/fancybox/jquery.mousewheel-3.0.2.pack.js
similarity index 100%
rename from public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
rename to public/javascripts/vendor/fancybox/jquery.mousewheel-3.0.2.pack.js
diff --git a/public/javascripts/fileuploader.js b/public/javascripts/vendor/fileuploader.js
similarity index 100%
rename from public/javascripts/fileuploader.js
rename to public/javascripts/vendor/fileuploader.js
diff --git a/public/javascripts/jquery-1.4.2.min.js b/public/javascripts/vendor/jquery-1.4.2.min.js
similarity index 100%
rename from public/javascripts/jquery-1.4.2.min.js
rename to public/javascripts/vendor/jquery-1.4.2.min.js
diff --git a/public/javascripts/jquery-ui-1.8.4.custom.min.js b/public/javascripts/vendor/jquery-ui-1.8.4.custom.min.js
similarity index 100%
rename from public/javascripts/jquery-ui-1.8.4.custom.min.js
rename to public/javascripts/vendor/jquery-ui-1.8.4.custom.min.js
diff --git a/public/javascripts/jquery.cycle/example.html b/public/javascripts/vendor/jquery.cycle/example.html
similarity index 100%
rename from public/javascripts/jquery.cycle/example.html
rename to public/javascripts/vendor/jquery.cycle/example.html
diff --git a/public/javascripts/jquery.cycle/jquery.cycle.all.min.js b/public/javascripts/vendor/jquery.cycle/jquery.cycle.all.min.js
similarity index 100%
rename from public/javascripts/jquery.cycle/jquery.cycle.all.min.js
rename to public/javascripts/vendor/jquery.cycle/jquery.cycle.all.min.js
diff --git a/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js b/public/javascripts/vendor/jquery.cycle/jquery.cycle.lite.min.js
similarity index 100%
rename from public/javascripts/jquery.cycle/jquery.cycle.lite.min.js
rename to public/javascripts/vendor/jquery.cycle/jquery.cycle.lite.min.js
diff --git a/public/javascripts/jquery.cycle/jquery.cycle.min.js b/public/javascripts/vendor/jquery.cycle/jquery.cycle.min.js
similarity index 100%
rename from public/javascripts/jquery.cycle/jquery.cycle.min.js
rename to public/javascripts/vendor/jquery.cycle/jquery.cycle.min.js
diff --git a/public/javascripts/jquery.cycle/readme.txt b/public/javascripts/vendor/jquery.cycle/readme.txt
similarity index 100%
rename from public/javascripts/jquery.cycle/readme.txt
rename to public/javascripts/vendor/jquery.cycle/readme.txt
diff --git a/public/javascripts/jquery.cycle/src/jquery.cycle.all.js b/public/javascripts/vendor/jquery.cycle/src/jquery.cycle.all.js
similarity index 100%
rename from public/javascripts/jquery.cycle/src/jquery.cycle.all.js
rename to public/javascripts/vendor/jquery.cycle/src/jquery.cycle.all.js
diff --git a/public/javascripts/jquery.cycle/src/jquery.cycle.js b/public/javascripts/vendor/jquery.cycle/src/jquery.cycle.js
similarity index 100%
rename from public/javascripts/jquery.cycle/src/jquery.cycle.js
rename to public/javascripts/vendor/jquery.cycle/src/jquery.cycle.js
diff --git a/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js b/public/javascripts/vendor/jquery.cycle/src/jquery.cycle.lite.js
similarity index 100%
rename from public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
rename to public/javascripts/vendor/jquery.cycle/src/jquery.cycle.lite.js
diff --git a/public/javascripts/jquery.infieldlabel.js b/public/javascripts/vendor/jquery.infieldlabel.js
similarity index 100%
rename from public/javascripts/jquery.infieldlabel.js
rename to public/javascripts/vendor/jquery.infieldlabel.js
diff --git a/public/javascripts/jquery.tipsy.js b/public/javascripts/vendor/jquery.tipsy.js
similarity index 100%
rename from public/javascripts/jquery.tipsy.js
rename to public/javascripts/vendor/jquery.tipsy.js
diff --git a/public/javascripts/jquery142.js b/public/javascripts/vendor/jquery142.js
similarity index 100%
rename from public/javascripts/jquery142.js
rename to public/javascripts/vendor/jquery142.js
diff --git a/public/javascripts/swfobject.js b/public/javascripts/vendor/swfobject.js
similarity index 100%
rename from public/javascripts/swfobject.js
rename to public/javascripts/vendor/swfobject.js
diff --git a/public/javascripts/web_socket.js b/public/javascripts/vendor/web_socket.js
similarity index 100%
rename from public/javascripts/web_socket.js
rename to public/javascripts/vendor/web_socket.js
diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/vendor/fileuploader.css
similarity index 100%
rename from public/stylesheets/fileuploader.css
rename to public/stylesheets/vendor/fileuploader.css
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/stylesheets/vendor/jquery.fancybox-1.3.1.css
similarity index 100%
rename from public/javascripts/fancybox/jquery.fancybox-1.3.1.css
rename to public/stylesheets/vendor/jquery.fancybox-1.3.1.css
diff --git a/public/stylesheets/tipsy.css b/public/stylesheets/vendor/tipsy.css
similarity index 100%
rename from public/stylesheets/tipsy.css
rename to public/stylesheets/vendor/tipsy.css
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index dda4a5fdb..db1541e3f 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -11,8 +11,8 @@
 #   - dist/**/*.js
 #
 src_files:
-  - public/javascripts/jquery142.js
-  - public/javascripts/jquery-ui-1.8.4.custom.min.js
+  - public/javascripts/vendor/jquery142.js
+  - public/javascripts/vendor/jquery-ui-1.8.4.custom.min.js
   - public/javascripts/aspect-edit.js
 
 # stylesheets