Merge branch 'master' into jarv/mirror

AUTHORS

@@ -9,3 +9,11 @@ Will Daly <will@edx.org>
 Bethany LaPenta <lapentab@mit.edu>
 Jay Zoldak <jzoldak@edx.org>
 Philippe Chiu <philippe.chiu@gmail.com>
+Marko Seric <marko.seric@math.uzh.ch>
+Feanil Patel <feanil@edx.org>
+Calen Pennington <calen.pennington@gmail.com>
+David Baumgold <david@davidbaumgold.com>
+Kevin Luo <kevluo@edx.org>
+Carson Gee <x@carsongee.com>
+Xavier Antoviaque <xavier@antoviaque.org>
+James Tauber <jtauber@jtauber.com>

README.md

@@ -5,8 +5,8 @@
 **This project is currently in alpha**
 
 The goal of the edx/configuration project is to provide a simple, but
-flexible, way for anyone to stand up an instance of the edX platform
-that is fully configured and ready-to-go.
+flexible, way for anyone to stand up an instance of Open edX that is
+fully configured and ready-to-go.
 
 Building the platform takes place to two phases:
 

vagrant/fullstack/Vagrantfile

-MEMORY = 1536
+MEMORY = 2048
 CPU_COUNT = 2
 
 Vagrant.configure("2") do |config|

vagrant/shortstack/Vagrantfile

-MEMORY = 1024
+MEMORY = 2048
 CPU_COUNT = 2
 
 Vagrant.configure("2") do |config|