diff --git a/.gitignore b/.gitignore
index 7c908775..2b60dff6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,12 @@ config.codekit
 !.env.heroku.php
 !.env.example.php
 
-# Assets development
+# Assets
 app/assets/bower_components
 node_modules
-public/css/
-public/js/
+public/build
+public/css
+public/js
 
 # Packages
 npm-debug.log
diff --git a/.travis.yml b/.travis.yml
index 65e3c376..163cba85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,9 @@ php:
 
 sudo: false
 
-install: travis_retry composer install --no-interaction --prefer-source
+install: travis_retry composer install --no-interaction --no-scripts --prefer-source
+
+before_script: php artisan cachet:one-click-deploy
 
 script:
   - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then vendor/bin/phpunit; fi;'
diff --git a/app.json b/app.json
index df3f588c..653c1d30 100644
--- a/app.json
+++ b/app.json
@@ -19,6 +19,6 @@
     "BUILDPACK_URL": { "value": "https://github.com/Scalingo/appsdeck-buildpack-php", "description": "Do not modify this value to work on Heroku" }
   },
   "scripts": {
-    "postdeploy": "php artisan migrate --env=heroku; php artisan key:generate"
+    "postdeploy": "php artisan migrate --env=heroku; php artisan key:generate;"
   }
 }
diff --git a/composer.json b/composer.json
index 1cdc437f..7b1e433d 100644
--- a/composer.json
+++ b/composer.json
@@ -57,11 +57,13 @@
         "post-install-cmd": [
             "php artisan optimize",
             "chmod -R 755 app/storage",
-            "php artisan cachet:one-click-deploy"
+            "php artisan cachet:one-click-deploy",
+            "$(npm bin -q)/gulp"
         ],
         "post-update-cmd": [
             "php artisan clear-compiled",
-            "php artisan optimize"
+            "php artisan optimize",
+            "$(npm bin -q)/gulp"
         ],
         "post-create-project-cmd": [
             "php artisan key:generate"
diff --git a/composer.lock b/composer.lock
index f40568cd..1ea96324 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "18f348e602f5894b0f1fd1189da5ba29",
+    "hash": "14c7b597c27afa4b28ab9004271e1417",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
diff --git a/docs/setup/install.md b/docs/setup/install.md
index 4c05449d..0a35aa25 100644
--- a/docs/setup/install.md
+++ b/docs/setup/install.md
@@ -37,6 +37,8 @@ $ cd Cachet
 $ composer install --no-dev -o
 ```
 
+If you don't want to compile the assets yet, you may want to run composer with the `--no-scripts` flag.
+
 # Deploy to Heroku
 
 When using the **Deploy to Heroku** button you needn't worry about using a database as the install will setup a free instance of ClearDB. Once installed Heroku can direct you to the setup page where you'll configure the site/application information and create an administrator account.
@@ -76,8 +78,6 @@ return [
     'DB_USERNAME' => 'root',
     'DB_PASSWORD' => 'secret',
 ];
-
-?>
 ```
 
 > Even though SQLite doesn't require a host, username or password, these still must be set (an empty string will suffice).
diff --git a/package.json b/package.json
index 50bf5a5e..44ebb822 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "devDependencies": {
+  "dependencies": {
     "gulp": "^3.8.8",
-    "gulp-rimraf": "0.1.1",
-    "laravel-elixir": "*",
-    "laravel-elixir-jshint": "0.1.6"
+    "gulp-rimraf": "~0.1.1",
+    "laravel-elixir": "~0.9.1",
+    "laravel-elixir-jshint": "~0.1.6"
   }
 }
diff --git a/public/packages/.gitkeep b/public/packages/.gitkeep
deleted file mode 100644
index e69de29b..00000000