Merge branch 'master' into deploy_keys

Conflicts:
	app/models/project.rb

db/migrate/20111214091851_create_web_hooks.rb

@@ -0,0 +1,9 @@
+class CreateWebHooks < ActiveRecord::Migration
+  def change
+    create_table :web_hooks do |t|
+      t.string :url
+      t.integer :project_id
+      t.timestamps
+    end
+  end
+end