Update install/upgrade instructions

INSTALL.md

@@ -8,7 +8,8 @@ To run this project, you'll need to have either PHP7 or Docker installed, and be
 
 - Install [PHP7](http://php.net/downloads.php)
 - Possibly install additional PHP extensions: `curl`, `xml`, `mbstring`, `dom`
-- Checkout the project. Be sure to install/update submodules (`git submodule update --recursive --remote`).
+- Checkout the project and be sure to install submodules: `git submodule update --init`
+- If you have already cloned the project, be sure to update submodules: `git submodule update --recursive --remote`
 - Run `./dev.sh` from the project root
 - Access [localhost:8000](http://localhost:8000) in your browser
 

dev.sh

@@ -18,5 +18,5 @@ fi
 $DIR/hooks/install.sh
 
 $PHPBIN composer.phar install
-
+git submodule update --init
 $PHPBIN --server localhost:8000 --docroot "$DIR/web" "$DIR/web/index.php"

update.php

@@ -16,7 +16,8 @@ if (!$force && !file_exists($needsUpdateFile)) {
 
 chdir(ROOT_DIR);
 
-Shell::exec('git fetch && git reset --hard origin/904-unify');
+Shell::exec('git fetch && git reset --hard origin/master');
+Shell::exec('git submodule update --init');
 Shell::exec('git pull --recurse-submodules');
 Shell::exec('php composer.phar install');