Merge branch 'release/5.0.0'

.gitignore

@@ -15,6 +15,7 @@ Thumbs.db
 # Ignore unwanted WP files #
 ############################
 
+wp/
 content/upgrade/
 content/plugins/
 

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "wp"]
-	path = wp
-	url = git://github.com/WordPress/WordPress.git

composer.json

@@ -10,7 +10,9 @@
     "require": {
         "wpackagist/advanced-custom-fields": "4.2.x",
         "wpackagist/posts-to-posts": "1.6.x",
-        "wpackagist/members": "0.2.x"
+        "wpackagist/members": "0.2.x",
+        "wordpress": "3.7.1",
+        "fancyguy/webroot-installer": "1.0.0"
     },
     "require-dev": {
         "wpackagist/debug-bar": "0.8.x"
@@ -19,11 +21,33 @@
         {
             "type":"composer",
             "url":"http://wpackagist.org"
+        },
+        {
+            "type"   : "package",
+            "package": {
+                "name"   : "wordpress",
+                "type"   : "webroot",
+                "version": "3.7.1",
+                "dist"   : {
+                    "url" : "http://wordpress.org/wordpress-3.7.1.zip",
+                    "type": "zip"
+                },
+                "source" : {
+                    "url"  : "https://github.com/WordPress/WordPress",
+                    "type" : "git",
+                    "reference": "3.7.1"
+                },
+                "require" : {
+                  "fancyguy/webroot-installer": "1.0.0"
+                }
+            }
         }
     ],
     "extra": {
         "installer-paths": {
             "content/plugins/{$name}/": ["type:wordpress-plugin"]
-        }
+        },
+        "webroot-dir": "wp",
+        "webroot-package": "wordpress"
     }
 }