Merge branch 'development' into greenkeeper/gatsby-1.9.154

.gitignore

@@ -4,5 +4,6 @@ node_modules
 .cache/
 # Build directory
 public/
+scottblog/
 .DS_Store
 yarn-error.log

.travis.yml

@@ -22,7 +22,14 @@ script:
   - npm run deploy
 
 after_script: 
-  - npm run alias
+on:
+  branch: development
+    - npm run alias:dev
+  branch: master
+    - npm run alias:prod
+
+  # - if [ "$TRAVIS_BRANCH" = "develop" ]; then npm run devScript; fi 
+  # - if [ "$TRAVIS_BRANCH" = "master" ]; then npm run prodScript; fi
 
 env:
 global:

package.json

@@ -30,18 +30,20 @@
   "keywords": ["gatsby", "personal", "blog"],
   "main": "n/a",
   "now": {
-    "name": "public",
-    "alias": "scottspence.now.sh"
+    "name": "scottblog",
+    "alias:dev": "scottspence.now.sh",
+    "alias:prod": "blog.scottspence.me"
   },
   "scripts": {
-    "clean": "rm -rf .cache/ && rm -rf public/",
-    "build": "gatsby build",
-    "deploy:now": "npm run clean && npm run build && now public/",
+    "clean": "rm -rf .cache/ && rm -rf scottblog/",
+    "build": "gatsby build && mv public scottblog",
+    "deploy:now": "npm run clean && npm run build && now scottblog/",
     "dev": "gatsby develop",
     "format": "pretty-quick",
     "precommit": "pretty-quick --staged",
-    "deploy": "now public/ -e NODE_ENV=production --token $NOW_TOKEN",
-    "alias": "now alias --token=$NOW_TOKEN"
+    "deploy": "now scottblog/ -e NODE_ENV=production --token $NOW_TOKEN",
+    "alias:dev": "now alias:dev --token=$NOW_TOKEN",
+    "alias:prod": "now alias:prod --token=$NOW_TOKEN"
   },
   "repository": {
     "type": "git",