diff --git a/.babelrc b/.babelrc
index b0b9a96ef0ecd..9b7d435ad38f2 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "stage": 0
+  "presets": ["es2015", "stage-0", "react"]
 }
diff --git a/.eslintrc b/.eslintrc
index e796f38cf78a0..7855f0cd88922 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,15 +1,33 @@
 {
+  "ecmaFeatures": {
+    "jsx": true,
+    "modules": true
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parser": "babel-eslint",
   "extends": "eslint-config-airbnb",
   "rules": {
+    "no-loop-func": 0,
+    "quotes": [2, "single"],
+    "strict": [2, "never"],
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
+    "react/react-in-jsx-scope": 2,
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": [0],
     "func-names": [0],
     "semi": [2, "never"],
     "no-extra-semi": [2],
     "space-before-function-paren": [2, "always"],
-    "no-else-return": [0],
+    "no-else-return": [0]
   },
   "globals": {
-    "__PREFIX_LINKS__": true,
+    "__PREFIX_LINKS__": true
   },
+  "plugins": [
+    "react"
+  ]
 }
diff --git a/.gitignore b/.gitignore
index c4703bbeb9ed4..9bf2373d66458 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,12 @@ build/Release
 
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
+node_modules/
 examples/biz-website/public/
 examples/blog/public/
 *.un~
-dist
+dist/
 bin/published.js
+
+# JetBrains IntelliJ IDEA-based project configuration directory
+.idea/
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000000000..b6b57efddad0f
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,6 @@
+{
+  "node": true,
+  "browser": true,
+  "esnext": true,
+  "newcap": false
+}
\ No newline at end of file
diff --git a/bin/build.coffee b/bin/build.coffee
deleted file mode 100644
index 8da20bef47c15..0000000000000
--- a/bin/build.coffee
+++ /dev/null
@@ -1,29 +0,0 @@
-program = require 'commander'
-path = require 'path'
-
-packageJson = require '../package.json'
-
-# Use compiled version of code when installed globally, otherwise use
-# babelscript version.
-if require './published'
-  build = require '../dist/utils/build'
-else
-  build = require '../lib/utils/build'
-
-program
-  .version(packageJson.version)
-  .option('--prefix-links', 'Build site with links prefixed (set prefix in your config).')
-  .parse(process.argv)
-
-relativeDirectory = program.args[0]
-unless relativeDirectory? then relativeDirectory = "."
-directory = path.resolve(relativeDirectory)
-
-program.directory = directory
-program.relativeDirectory = relativeDirectory
-
-build program, (err) ->
-  if err?
-    throw err
-  else
-    console.log('Done')
diff --git a/bin/build.js b/bin/build.js
new file mode 100644
index 0000000000000..9f5f1090b91cd
--- /dev/null
+++ b/bin/build.js
@@ -0,0 +1,27 @@
+import program from 'commander'
+import path from 'path'
+
+const packageJson = require('../package.json')
+
+// Use compiled version of code when installed globally, otherwise use babel script version.
+const build = require(('./published.js') ? ('../dist/utils/build') : ('../lib/utils/build'))
+
+program
+  .version(packageJson.version)
+	.option('--prefix-links', 'Build site with links prefixed (set prefix in your config).')
+	.parse(process.argv)
+
+let relativeDirectory = program.args[0]
+if (!(typeof relativeDirectory !== 'undefined' && relativeDirectory !== null)) { relativeDirectory = '.' }
+const directory = path.resolve(relativeDirectory)
+
+program.directory = directory
+program.relativeDirectory = relativeDirectory
+
+build(program, function (err) {
+  if ((typeof err !== 'undefined' && err !== null)) {
+    throw err
+  } else {
+    return console.log('Done')
+  }
+})
diff --git a/bin/cli.js b/bin/cli.js
index 9645aa5cbe01e..3b5c2086a3b00 100755
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 
-require('coffee-script/register')
 require('./index')
diff --git a/bin/develop.coffee b/bin/develop.coffee
deleted file mode 100644
index 5f73160b2eab6..0000000000000
--- a/bin/develop.coffee
+++ /dev/null
@@ -1,26 +0,0 @@
-program = require 'commander'
-path = require 'path'
-
-packageJson = require '../package.json'
-
-# Use compiled version of code when installed globally, otherwise use
-# babelscript version.
-if require './published'
-  develop = require '../dist/utils/develop'
-else
-  develop = require '../lib/utils/develop'
-
-program
-  .version(packageJson.version)
-  .option('-h, --host <url>', 'Set host. Defaults to 0.0.0.0', "0.0.0.0")
-  .option('-p, --port <port>', 'Set port. Defaults to 8000', "8000")
-  .parse(process.argv)
-
-relativeDirectory = program.args[0]
-unless relativeDirectory? then relativeDirectory = "."
-directory = path.resolve(relativeDirectory)
-
-program.directory = directory
-program.relativeDirectory = relativeDirectory
-
-develop(program)
diff --git a/bin/develop.js b/bin/develop.js
new file mode 100644
index 0000000000000..beb43c2b2879e
--- /dev/null
+++ b/bin/develop.js
@@ -0,0 +1,22 @@
+import program from 'commander'
+import path from 'path'
+
+import packageJson from '../package.json'
+
+// Use compiled version of code when installed globally, otherwise use babel script version.
+const develop = require(('./published.js') ? ('../dist/utils/develop') : ('../lib/utils/develop'))
+
+program
+  .version(packageJson.version)
+  .option('-h, --host <url>', 'Set host. Defaults to 0.0.0.0', '0.0.0.0')
+  .option('-p, --port <port>', 'Set port. Defaults to 8000', '8000')
+  .parse(process.argv)
+
+let relativeDirectory = program.args[0]
+if (!(typeof relativeDirectory !== 'undefined' && relativeDirectory !== null)) { relativeDirectory = '.' }
+const directory = path.resolve(relativeDirectory)
+
+program.directory = directory
+program.relativeDirectory = relativeDirectory
+
+develop(program)
diff --git a/bin/gatsby-build.js b/bin/gatsby-build.js
index b02baf0f62397..5d55cc92b2192 100755
--- a/bin/gatsby-build.js
+++ b/bin/gatsby-build.js
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 
-require('babel/register')
-require('coffee-script/register')
+require('babel-register')
 require('./build')
diff --git a/bin/gatsby-develop.js b/bin/gatsby-develop.js
index d5c0fb1083635..cc5273c9430c7 100755
--- a/bin/gatsby-develop.js
+++ b/bin/gatsby-develop.js
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-require('babel/register')
 
-require('coffee-script/register')
+require('babel-register')
 require('./develop')
diff --git a/bin/gatsby-new.js b/bin/gatsby-new.js
index ce8a5a72395d9..d93efe2ab44ff 100755
--- a/bin/gatsby-new.js
+++ b/bin/gatsby-new.js
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 
-require('coffee-script/register')
-require('babel/register')
+require('babel-register')
 require('./new')
diff --git a/bin/index.coffee b/bin/index.js
similarity index 75%
rename from bin/index.coffee
rename to bin/index.js
index f093722c4080b..e0f3d4110d937 100644
--- a/bin/index.coffee
+++ b/bin/index.js
@@ -1,7 +1,6 @@
-program = require 'commander'
-path = require 'path'
+const program = require('commander')
 
-packageJson = require '../package.json'
+const packageJson = require('../package.json')
 
 program
   .version(packageJson.version)
diff --git a/bin/new.coffee b/bin/new.coffee
deleted file mode 100644
index 3457a462293b3..0000000000000
--- a/bin/new.coffee
+++ /dev/null
@@ -1,29 +0,0 @@
-program = require 'commander'
-loggy = require 'loggy'
-
-packageJson = require '../package.json'
-
-# Use compiled version of code when installed globally, otherwise use
-# babelscript version.
-if require './published'
-  initStarter = require '../dist/utils/init-starter'
-else
-  initStarter = require '../lib/utils/init-starter'
-
-program
-  .version(packageJson.version)
-  .parse(process.argv)
-
-if program.args.length is 1
-  rootPath = program.args[0]
-  starter = "gh:gatsbyjs/gatsby-starter-default"
-else
-  rootPath = program.args[0]
-  starter = program.args[1]
-
-initStarter starter, {
-  rootPath: rootPath
-  logger: loggy
-}, (error) ->
-  if error
-    loggy.error error
diff --git a/bin/new.js b/bin/new.js
new file mode 100644
index 0000000000000..f9b1dffdd119b
--- /dev/null
+++ b/bin/new.js
@@ -0,0 +1,23 @@
+const program = require('commander')
+const loggy = require('loggy')
+
+const packageJson = require('../package.json')
+
+// Use compiled version of code when installed globally, otherwise use babelscript version.
+const initStarter = require(('./published.js') ? ('../dist/utils/init-starter') : ('../lib/utils/init-starter'))
+
+program
+  .version(packageJson.version)
+  .parse(process.argv)
+
+const rootPath = program.args[0]
+const starter = ((program.args.length === 1) ? ('gh:gatsbyjs/gatsby-starter-default') : (program.args[1]))
+
+initStarter(starter, {
+  rootPath,
+  logger: loggy,
+}, function (error) {
+  if (error) {
+    return loggy.error(error)
+  }
+})
diff --git a/lib/isomorphic/HTML.jsx b/lib/isomorphic/HTML.js
similarity index 79%
rename from lib/isomorphic/HTML.jsx
rename to lib/isomorphic/HTML.js
index 5be685137a105..64fe551945a3d 100644
--- a/lib/isomorphic/HTML.jsx
+++ b/lib/isomorphic/HTML.js
@@ -1,4 +1,6 @@
-import React, {PropTypes} from 'react'
+'use strict'
+
+import React, { PropTypes } from 'react'
 import Typography from 'typography'
 
 const TypographyStyle = new Typography().TypographyStyle
@@ -10,14 +12,14 @@ module.exports = React.createClass({
     favicon: PropTypes.string,
   },
 
-  getDefaultProps: function () {
+  getDefaultProps () {
     return {
       title: 'Default title',
       body: '',
     }
   },
 
-  render: function () {
+  render () {
     return (
     <html lang="en">
     <head>
@@ -27,12 +29,12 @@ module.exports = React.createClass({
       <title>
         {this.props.title}
       </title>
-      <link rel="shortcut icon" href={this.props.favicon} />
+      <link rel="shortcut icon" href={ this.props.favicon } />
       <TypographyStyle/>
-      <style dangerouslySetInnerHTML={{ __html: `body {color: rgb(66,66,66)} h1,h2,h3,h4,h5,h6 {color: rgb(44,44,44)}a {color: rgb(42,93,173)text-decoration: none}a:hover{text-decoration: underline}`}} />
+      <style dangerouslySetInnerHTML={{ __html: `body {color: rgb(66,66,66)} h1,h2,h3,h4,h5,h6 {color: rgb(44,44,44)}a {color: rgb(42,93,173)text-decoration: none}a:hover{text-decoration: underline}` }} />
     </head>
     <body className="landing-page">
-      <div id="react-mount" dangerouslySetInnerHTML={{__html: this.props.body}} />
+      <div id="react-mount" dangerouslySetInnerHTML={{ __html: this.props.body }} />
       <script src="/bundle.js" />
     </body>
     </html>
diff --git a/lib/isomorphic/create-routes.coffee b/lib/isomorphic/create-routes.coffee
deleted file mode 100644
index d6d22713ba0bb..0000000000000
--- a/lib/isomorphic/create-routes.coffee
+++ /dev/null
@@ -1,107 +0,0 @@
-Router = require 'react-router'
-filter = require 'lodash/collection/filter'
-sortBy = require 'lodash/collection/sortBy'
-last = require 'lodash/array/last'
-includes = require 'underscore.string/include'
-{ config } = require 'config'
-{ link } = require './gatsby-helpers'
-
-module.exports = (pages, pagesReq) ->
-  templates = {}
-  templates.root = Router.createRoute({
-    name: 'root-template'
-    path: link("/")
-    handler: pagesReq './_template'
-  })
-
-  # Arrange pages in data structure according to their position
-  # on the file system. Then use this to create routes.
-  #
-  # Algorithm
-  # 1. Find all templates.
-  # 2. Create routes for each template russian-doll style.
-  # 3. For each index file paired with a template, create a default route
-  # 4. Create normal routes for each remaining file under the appropriate
-  # template
-  templateFiles = filter pages, (page) ->
-    page.file.name is "_template" and
-      page.file.dirname isnt "."
-
-  for templateFile in templateFiles
-    # Find the parent template of this template.
-    parentTemplates = filter(templateFiles, (template) ->
-      includes(templateFile.requirePath, template.file.dirname)
-    )
-    parentTemplates = sortBy(parentTemplates, (template) ->
-      template?.file.dirname.length)
-    parentTemplateFile = last(parentTemplates)
-    parentRoute = templates[parentTemplateFile?.file.dirname]
-
-    unless parentRoute
-      parentRoute = templates.root
-
-    templates[templateFile.file.dirname] = Router.createRoute({
-      name: templateFile.file.dirname + "-template"
-      path: link(templateFile.templatePath)
-      parentRoute: parentRoute
-      handler: pagesReq "./" + templateFile.requirePath
-    })
-
-  # Remove files that start with an underscore as this indicates
-  # the file shouldn't be turned into a page.
-  filteredPages = filter pages, (page) -> page.file.name.slice(0,1) isnt '_'
-
-  markdownWrapper = require 'wrappers/md'
-  htmlWrapper = require 'wrappers/html'
-
-  for page in filteredPages
-    # TODO add ways to load data for other file types.
-    # Should be able to install a gatsby-toml plugin to add support
-    # for TOML. Perhaps everything other than JSX and Markdown should be plugins.
-    # Or even they are plugins but they have built-in "blessed" plugins.
-    switch page.file.ext
-      when "md"
-        handler = markdownWrapper
-        page.data = pagesReq "./" + page.requirePath
-      when "html"
-        handler = htmlWrapper
-      when "jsx"
-        handler = pagesReq "./" + page.requirePath
-        page.data = if pagesReq("./" + page.requirePath).metadata
-          pagesReq("./" + page.requirePath).metadata()
-      when "cjsx"
-        handler = pagesReq "./" + page.requirePath
-        page.data = if pagesReq("./" + page.requirePath).metadata
-          pagesReq("./" + page.requirePath).metadata()
-      else
-        handler = pagesReq "./" + page.requirePath
-
-    # Determine parent template for page.
-    parentRoutes = filter(templateFiles, (templateFile) ->
-      includes(page.requirePath, templateFile.file.dirname)
-    )
-    parentRoutes = sortBy(parentRoutes, (route) -> route?.file.dirname.length)
-    parentTemplateFile = last(parentRoutes)
-    parentRoute = templates[parentTemplateFile?.file.dirname]
-
-    unless parentRoute
-      parentRoute = templates.root
-
-    # If page is an index page *and* in the same directory as a template,
-    # it is the default route (for that template).
-    if includes(page.path, "/index") and
-        parentRoute.file.dirname is parentTemplateFile.file.dirname
-      Router.createDefaultRoute({
-        name: page.path
-        parentRoute: parentRoute
-        handler: handler
-      })
-    else
-      Router.createRoute({
-        name: page.path
-        path: link(page.path)
-        parentRoute: parentRoute
-        handler: handler
-      })
-
-  return templates.root
diff --git a/lib/isomorphic/create-routes.js b/lib/isomorphic/create-routes.js
new file mode 100644
index 0000000000000..24e1ddd606fa9
--- /dev/null
+++ b/lib/isomorphic/create-routes.js
@@ -0,0 +1,111 @@
+'use strict'
+
+import Router from 'react-router'
+import filter from 'lodash/collection/filter'
+import sortBy from 'lodash/collection/sortBy'
+import last from 'lodash/array/last'
+import includes from 'underscore.string/include'
+import { link } from './gatsby-helpers'
+
+module.exports = function (pages, pagesReq) {
+  let handler
+  let templateFile
+  let parentRoutes
+  let parentRoute
+  let parentTemplates
+  let parentTemplateFile
+  const templates = {}
+  templates.root = Router.createRoute({
+    name: 'root-template',
+    path: link('/'),
+    handler: pagesReq('./_template'),
+  })
+  // Arrange pages in data structure according to their position
+  // on the file system. Then use this to create routes.
+  //
+  // Algorithm
+  // 1. Find all templates.
+  // 2. Create routes for each template russian-doll style.
+  // 3. For each index file paired with a template, create a default route
+  // 4. Create normal routes for each remaining file under the appropriate template
+  const templateFiles = filter(pages, function (page) {
+    return page.file.name === '_template' && page.file.dirname !== '.'
+  })
+  for (let i = 0; i < templateFiles.length; i++) {
+    // Find the parent template of this template.
+    templateFile = templateFiles[i]
+    parentTemplates = filter(templateFiles, function (template) {
+      return includes(templateFile.requirePath, template.file.dirname)
+    })
+    parentTemplates = sortBy(parentTemplates, function (template) {
+      return ((typeof template !== 'undefined' && template !== null) ? template.file : undefined).dirname.length
+    })
+    parentTemplateFile = last(parentTemplates)
+    parentRoute = templates[((typeof parentTemplateFile !== 'undefined' && parentTemplateFile !== null) ? parentTemplateFile.file : undefined).dirname]
+    if (!parentRoute) { parentRoute = templates.root }
+    templates[templateFile.file.dirname] = Router.createRoute({
+      name: templateFile.file.dirname + '-template',
+      path: link(templateFile.templatePath),
+      parentRoute,
+      handler: pagesReq('./' + templateFile.requirePath),
+    })
+  }
+  // Remove files that start with an underscore as this indicates the file shouldn't be turned into a page.
+  const filteredPages = filter(pages, function (page) {
+    return page.file.name.slice(0, 1) !== '_'
+  })
+  const markdownWrapper = require('wrappers/md')
+  const htmlWrapper = require('wrappers/html')
+  for (let j = 0, page; j < filteredPages.length; j++) {
+    // TODO add ways to load data for other file types.
+    // Should be able to install a gatsby-toml plugin to add support for TOML.
+    // Perhaps everything other than JSX and Markdown should be plugins.
+    // Or even they are plugins but they have built-in "blessed" plugins.
+    page = filteredPages[j]
+    switch (page.file.ext) {
+      case 'md':
+        handler = markdownWrapper
+        page.data = pagesReq('./' + page.requirePath)
+        break
+      case 'html':
+        handler = htmlWrapper
+        break
+      case 'jsx':
+        handler = pagesReq('./' + page.requirePath)
+        page.data = (() => {
+          if (pagesReq('./' + page.requirePath).metadata) {
+            return pagesReq('./' + page.requirePath).metadata()
+          }
+        })()
+        break
+      default:
+        handler = pagesReq('./' + page.requirePath)
+    }
+    // Determine parent template for page.
+    parentRoutes = filter(templateFiles, function () {
+      return includes(page.requirePath, templateFile.file.dirname)
+    })
+    parentRoutes = sortBy(parentRoutes, function (route) {
+      return ((typeof route !== 'undefined' && route !== null) ? route.file : undefined).dirname.length
+    })
+    parentTemplateFile = last(parentRoutes)
+    parentRoute = templates[((typeof parentTemplateFile !== 'undefined' && parentTemplateFile !== null) ? parentTemplateFile.file : undefined).dirname]
+    if (!parentRoute) { parentRoute = templates.root }
+    // If page is an index page *and* in the same directory as a template, it is the default route (for that template).
+    if (includes(page.path, '/index') && parentRoute.file.dirname === parentTemplateFile.file.dirname) {
+      Router.createDefaultRoute({
+        name: page.path,
+        parentRoute,
+        handler,
+      })
+    } else {
+      Router.createRoute({
+        name: page.path,
+        path: link(page.path),
+        parentRoute,
+        handler,
+      })
+    }
+  }
+  return templates.root
+}
diff --git a/lib/isomorphic/gatsby-helpers.js b/lib/isomorphic/gatsby-helpers.js
index f89a7b19519e5..65f32ca45c3b6 100644
--- a/lib/isomorphic/gatsby-helpers.js
+++ b/lib/isomorphic/gatsby-helpers.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import { pages, config } from 'config'
 import filter from 'lodash/collection/filter'
 import first from 'lodash/array/first'
@@ -15,8 +17,7 @@ const link = exports.link = function (_link) {
 
 // Get the child pages for a given template.
 exports.templateChildrenPages = function (filename, state) {
-  // Pop off the file name to leave the relative directory
-  // path to this template.
+  // Pop off the file name to leave the relative directory path to this template.
   const split = filename.split('/')
   split.pop()
   let result = '/' + split.join('/')
diff --git a/lib/isomorphic/wrappers/html.jsx b/lib/isomorphic/wrappers/html.js
similarity index 60%
rename from lib/isomorphic/wrappers/html.jsx
rename to lib/isomorphic/wrappers/html.js
index e368359ac61ef..2b6e15300cd3a 100644
--- a/lib/isomorphic/wrappers/html.jsx
+++ b/lib/isomorphic/wrappers/html.js
@@ -1,4 +1,6 @@
-import React, {PropTypes} from 'react'
+'use strict'
+
+import React, { PropTypes } from 'react'
 
 module.exports = React.createClass({
   propTypes: {
@@ -7,10 +9,10 @@ module.exports = React.createClass({
     }),
   },
 
-  render: function () {
+  render () {
     const html = this.props.page.data
     return (
-    <div dangerouslySetInnerHTML={{__html: html}} />
+    <div dangerouslySetInnerHTML={{ __html: html }} />
     )
   },
 })
diff --git a/lib/isomorphic/wrappers/md.jsx b/lib/isomorphic/wrappers/md.js
similarity index 70%
rename from lib/isomorphic/wrappers/md.jsx
rename to lib/isomorphic/wrappers/md.js
index beecd53f73578..56f8ec649df1c 100644
--- a/lib/isomorphic/wrappers/md.jsx
+++ b/lib/isomorphic/wrappers/md.js
@@ -1,4 +1,6 @@
-import React, {PropTypes} from 'react'
+'use strict'
+
+import React, { PropTypes } from 'react'
 
 module.exports = React.createClass({
   propTypes: {
@@ -9,12 +11,12 @@ module.exports = React.createClass({
     }),
   },
 
-  render: function () {
+  render () {
     const post = this.props.page.data
     return (
       <div className="markdown">
         <h1>{post.title}</h1>
-        <div dangerouslySetInnerHTML={{__html: post.body}} />
+        <div dangerouslySetInnerHTML={{ __html: post.body }} />
       </div>
     )
   },
diff --git a/lib/loaders/config-loader/index.coffee b/lib/loaders/config-loader/index.coffee
deleted file mode 100644
index 3b5207b84bf6e..0000000000000
--- a/lib/loaders/config-loader/index.coffee
+++ /dev/null
@@ -1,25 +0,0 @@
-toml = require('toml')
-loaderUtils = require('loader-utils')
-Router = require 'react-router'
-path = require 'path'
-
-globPages = require '../../utils/glob-pages'
-
-module.exports = (source) ->
-  @cacheable()
-  callback = @async()
-
-  value = {}
-
-  directory = loaderUtils.parseQuery(@query).directory
-
-  # TODO support YAML + JSON + CSON as well here.
-  config = toml.parse(source)
-  value.config = config
-  value.relativePath = path.relative('.', directory)
-
-  # Load pages.
-  globPages directory, (err, pagesData) =>
-    value.pages = pagesData
-    @value = [value]
-    callback null, 'module.exports = ' + JSON.stringify(value, undefined, "\t")
diff --git a/lib/loaders/config-loader/index.js b/lib/loaders/config-loader/index.js
index cf06d29fcb433..c432d4fd649fe 100644
--- a/lib/loaders/config-loader/index.js
+++ b/lib/loaders/config-loader/index.js
@@ -1,23 +1,26 @@
-const toml = require('toml')
-const loaderUtils = require('loader-utils')
-const path = require('path')
+'use strict'
+
+import toml from 'toml'
+import loaderUtils from 'loader-utils'
+import path from 'path'
+
 const globPages = require('../../utils/glob-pages')
 
 module.exports = function (source) {
   this.cacheable()
   const callback = this.async()
+  const value = {}
   const directory = loaderUtils.parseQuery(this.query).directory
-  const config = toml.parse(source)
 
-  let value
-  value = {}
+  // TODO support YAML + JSON + CSON as well here.
+  const config = toml.parse(source)
   value.config = config
   value.relativePath = path.relative('.', directory)
-  return globPages(directory, (function (_this) {
-    return function (err, pagesData) {
-      value.pages = pagesData
-      _this.value = [value]
-      return callback(null, 'module.exports = ' + JSON.stringify(value, void 0, '\t'))
-    }
-  })(this))
+
+  // Load pages.
+  return globPages(directory, (err, pagesData) => {
+    value.pages = pagesData
+    this.value = [value]
+    return callback(null, 'module.exports = ' + JSON.stringify(value, undefined, '\t'))
+  })
 }
diff --git a/lib/loaders/markdown-loader/index.js b/lib/loaders/markdown-loader/index.js
index 233aa8a990f92..55f9337c50dd0 100644
--- a/lib/loaders/markdown-loader/index.js
+++ b/lib/loaders/markdown-loader/index.js
@@ -1,19 +1,21 @@
+'use strict'
+
 import frontMatter from 'front-matter'
 import markdownIt from 'markdown-it'
-import hljs from 'highlight.js'
+import hljs from 'highlight'
 import _ from 'underscore'
 
 const highlight = (str, lang) => {
   if ((lang !== null) && hljs.getLanguage(lang)) {
     try {
       return hljs.highlight(lang, str).value
-    } catch (_error ) {
+    } catch (_error) {
       console.error(_error)
     }
   }
   try {
     return hljs.highlightAuto(str).value
-  } catch (_error ) {
+  } catch (_error) {
     console.error(_error)
   }
   return ''
@@ -23,7 +25,7 @@ const md = markdownIt({
   html: true,
   linkify: true,
   typographer: true,
-  highlight: highlight,
+  highlight,
 })
 
 module.exports = function (content) {
@@ -32,7 +34,7 @@ module.exports = function (content) {
   const meta = frontMatter(content)
   body = md.render(meta.body)
   const result = _.extend({}, meta.attributes, {
-    body: body,
+    body,
   })
   this.value = result
   return 'module.exports = ' + JSON.stringify(result)
diff --git a/lib/utils/build-production.coffee b/lib/utils/build-production.coffee
deleted file mode 100644
index fa8c9b6b174d7..0000000000000
--- a/lib/utils/build-production.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-webpack = require 'webpack'
-webpackConfig = require './webpack.config'
-getUserGatsbyConfig = require './get-user-gatsby-config'
-
-module.exports = (program, callback) ->
-  {relativeDirectory, directory} = program
-
-  #### Build production js.
-  compilerConfig = webpackConfig(program, directory, 'production')
-  config = getUserGatsbyConfig(compilerConfig, 'production')
-
-  webpack(config.resolve()).run (err, stats) ->
-    callback err, stats
-
diff --git a/lib/utils/build-production.js b/lib/utils/build-production.js
new file mode 100644
index 0000000000000..49430d518a0a7
--- /dev/null
+++ b/lib/utils/build-production.js
@@ -0,0 +1,16 @@
+'use strict'
+
+import webpack from 'webpack'
+import webpackConfig from './webpack.config'
+import getUserGatsbyConfig from './get-user-gatsby-config'
+
+module.exports = function (program, callback) {
+  const { directory } = program
+
+  const compilerConfig = webpackConfig(program, directory, 'production')
+  const config = getUserGatsbyConfig(compilerConfig, 'production')
+
+  return webpack(config.resolve()).run(function (err, stats) {
+    return callback(err, stats)
+  })
+}
diff --git a/lib/utils/build.js b/lib/utils/build.js
index 0d69572d58531..bc25c3ca2736d 100644
--- a/lib/utils/build.js
+++ b/lib/utils/build.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import generateStaticPages from './static-generation'
 import buildProductionBundle from './build-production'
 import postBuild from './post-build'
@@ -9,7 +11,7 @@ module.exports = (program, callback) => {
   try {
     customPostBuild = require(directory + '/post-build')
   } catch (e) {
-    // Do nothiing.
+    // Do nothing.
   }
 
   console.log('Generating static html pages')
@@ -30,7 +32,7 @@ module.exports = (program, callback) => {
           console.log('failed to copy assets')
           return callback(error)
         }
-        if ( (typeof customPostBuild !== 'undefined' && customPostBuild !== null) ) {
+        if ((typeof customPostBuild !== 'undefined' && customPostBuild !== null)) {
           console.log('Performing custom post-build steps')
           return globPages(directory, (globError, pages) => {
             return customPostBuild(pages, (customPostBuildError) => {
diff --git a/lib/utils/develop.js b/lib/utils/develop.js
index 774b675e8a8df..073fae465feff 100644
--- a/lib/utils/develop.js
+++ b/lib/utils/develop.js
@@ -1,4 +1,5 @@
-require('node-cjsx').transform()
+'use strict'
+
 import Hapi from 'hapi'
 import Boom from 'boom'
 import React from 'react'
@@ -13,6 +14,7 @@ import fs from 'fs'
 import getUserGatsbyConfig from './get-user-gatsby-config'
 import globPages from './glob-pages'
 import webpackConfig from './webpack.config'
+
 const debug = require('debug')('gatsby:application')
 
 module.exports = (program) => {
diff --git a/lib/utils/get-user-gatsby-config.js b/lib/utils/get-user-gatsby-config.js
index 64d9e1068b1e4..c6066c1f5b8af 100644
--- a/lib/utils/get-user-gatsby-config.js
+++ b/lib/utils/get-user-gatsby-config.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import path from 'path'
 import fs from 'fs'
 
diff --git a/lib/utils/glob-pages.coffee b/lib/utils/glob-pages.coffee
deleted file mode 100644
index ad74ac9c6c707..0000000000000
--- a/lib/utils/glob-pages.coffee
+++ /dev/null
@@ -1,78 +0,0 @@
-glob = require('glob')
-path = require 'path'
-parsePath = require 'parse-filepath'
-fs = require 'fs'
-frontMatter = require 'front-matter'
-_ = require 'underscore'
-toml = require('toml')
-debug = require('debug')('gatsby:glob')
-
-module.exports = (directory, callback) ->
-  # Read in site config.
-  try
-    siteConfig = toml.parse(fs.readFileSync(directory + "/config.toml"))
-
-  pagesData = []
-
-  app = require directory + "/app"
-
-  # Make this easy to add to through the config?
-  # Or just keep adding extensions...?
-  glob directory + '/pages/**/?(*.coffee|*.cjsx|*.jsx|*.js|*.md|*.html)', null, (err, pages) =>
-    if err then return callback(err)
-
-    for page in pages
-      pageData = {}
-      pageData.file = {}
-
-      pageData.file = parsed = parsePath(path.relative(directory + "/pages", page))
-
-      pageData.file.ext = ext = parsed.extname.slice(1)
-
-      # Determine require path
-      relativePath = path.relative(directory, page)
-      pageData.requirePath = path.relative(directory + "/pages", page)
-
-      # Load data for each file type.
-      if ext is "md"
-        rawData = frontMatter(fs.readFileSync(page, 'utf-8'))
-        data = _.extend {}, rawData.attributes
-        pageData.data = data
-      else if ext is "html"
-        pageData.data = fs.readFileSync(page, 'utf-8')
-      else
-        data = {}
-
-      # Determine path for page (unless it's a file that starts with an
-      # underscore as these don't become pages).
-      unless parsed.name.slice(0,1) is "_"
-        if data.path
-          # Path was hardcoded.
-          pageData.path = data.path
-        else if app.rewritePath
-          pageData.path = app.rewritePath(parsed, pageData)
-
-        # If none of the above options set a path.
-        unless pageData.path?
-          # If this is an index page or template, it's path is /foo/bar/
-          if parsed.name is "index" or parsed.name is "template"
-            if parsed.dirname is "."
-              pageData.path = "/"
-            else
-              pageData.path = "/" + parsed.dirname + "/"
-          # Else if not an index, create a path like /foo/bar/
-          # and rely upon static-site-generator-webpack-plugin to add index.html
-          else
-            if parsed.dirname is "."
-              pageData.path = "/" + parsed.name + "/"
-            else
-              pageData.path = "/" + parsed.dirname + "/" + parsed.name + "/"
-
-      # Set the "template path"
-      else if parsed.name is "_template"
-        pageData.templatePath = "/" + parsed.dirname + "/"
-
-      pagesData.push pageData
-
-    debug('globbed', pagesData.length, 'pages');
-    callback(null, pagesData)
diff --git a/lib/utils/glob-pages.js b/lib/utils/glob-pages.js
new file mode 100644
index 0000000000000..cc0cc60995b84
--- /dev/null
+++ b/lib/utils/glob-pages.js
@@ -0,0 +1,96 @@
+'use strict'
+
+import glob from 'glob'
+import path from 'path'
+import parsePath from 'parse-filepath'
+import fs from 'fs'
+import frontMatter from 'front-matter'
+import _ from 'underscore'
+// import toml from 'toml'
+
+const debug = require('debug')('gatsby:glob')
+
+module.exports = function (directory, callback) {
+  // Read in site config.
+  try {
+    // const siteConfig = toml.parse(fs.readFileSync(directory + '/config.toml'))
+  } catch (error) {
+    // Do nothing
+  }
+
+  const pagesData = []
+  const app = require(directory + '/app')
+
+  // Make this easy to add to through the config?
+  // Or just keep adding extensions...?
+  return glob(directory + '/pages/**/?(*.jsx|*.js|*.md|*.html)', null, (err, pages) => {
+    if (err) { return callback(err) }
+
+    for (let i = 0, page; i < pages.length; i++) {
+      page = pages[i]
+      let parsed
+      let ext
+      let data
+      const pageData = {}
+      pageData.file = {}
+
+      pageData.file = parsed = parsePath(path.relative(directory + '/pages', page))
+
+      pageData.file.ext = ext = parsed.extname.slice(1)
+
+      // Determine require path
+      // const relativePath = path.relative(directory, page)
+      pageData.requirePath = path.relative(directory + '/pages', page)
+
+      // Load data for each file type.
+      if (ext === 'md') {
+        const rawData = frontMatter(fs.readFileSync(page, 'utf-8'))
+        data = _.extend({}, rawData.attributes)
+        pageData.data = data
+      } else if (ext === 'html') {
+        pageData.data = fs.readFileSync(page, 'utf-8')
+      } else {
+        data = {}
+      }
+
+      // Determine path for page (unless it's a file that starts with an
+      // underscore as these don't become pages).
+      if (!(parsed.name.slice(0, 1) === '_')) {
+        if (data.path) {
+          // Path was hardcoded.
+          pageData.path = data.path
+        } else if (app.rewritePath) {
+          pageData.path = app.rewritePath(parsed, pageData)
+        }
+
+        // If none of the above options set a path.
+        if (!(pageData.path !== null)) {
+          // If this is an index page or template, it's path is /foo/bar/
+          if (parsed.name === 'index' || parsed.name === 'template') {
+            if (parsed.dirname === '.') {
+              pageData.path = '/'
+            } else {
+              pageData.path = '/' + parsed.dirname + '/'
+            }
+            // Else if not an index, create a path like /foo/bar/
+            // and rely upon static-site-generator-webpack-plugin to add index.html
+          } else {
+            if (parsed.dirname === '.') {
+              pageData.path = '/' + parsed.name + '/'
+            } else {
+              pageData.path = '/' + parsed.dirname + '/' + parsed.name + '/'
+            }
+          }
+        }
+
+        // Set the "template path"
+      } else if (parsed.name === '_template') {
+        pageData.templatePath = '/' + parsed.dirname + '/'
+      }
+
+      pagesData.push(pageData)
+    }
+    callback(null, pagesData)
+    return debug('globbed', pagesData.length, 'pages')
+  })
+}
diff --git a/lib/utils/init-starter.js b/lib/utils/init-starter.js
index d419c2d04189e..010adc69f906e 100644
--- a/lib/utils/init-starter.js
+++ b/lib/utils/init-starter.js
@@ -1,3 +1,5 @@
+'use strict'
+
 const exec = require('child_process').exec
 import fs from 'fs'
 import mkdirp from 'mkdirp'
@@ -51,7 +53,7 @@ const ignored = (path) => {
 // Returns nothing.
 const copy = (starterPath, rootPath, callback) => {
   const copyDirectory = () => {
-    ncp(starterPath, rootPath, {filter: ignored, stopOnErr: true}, (error) => {
+    ncp(starterPath, rootPath, { filter: ignored, stopOnErr: true }, (error) => {
       if (error !== null) return callback(new Error(error))
       logger.log('Created starter directory layout')
       install(rootPath, callback)
@@ -63,7 +65,7 @@ const copy = (starterPath, rootPath, callback) => {
     if (error !== null) return callback(new Error(error))
     fsexists(starterPath, (exists) => {
       if (!exists) {
-        const chmodError = 'starter ' + starterPath + " doesn't exist"
+        const chmodError = 'starter ' + starterPath + ' doesn\'t exist'
         return callback(new Error(chmodError))
       }
       logger.log('Copying local starter to ' + rootPath + '...')
@@ -92,7 +94,7 @@ const clone = (address, rootPath, callback) => {
     }
     logger.log('Created starter directory layout')
     rimraf(sysPath.join(rootPath, '.git'), (rimRafError) => {
-      if (error !== null) return callback(new Error(rimRafError))
+      if (error !== null) {return callback(new Error(rimRafError))}
       install(rootPath, callback)
     })
   })
diff --git a/lib/utils/post-build.js b/lib/utils/post-build.js
index f0bc8ea753a45..f69872b60cfc9 100644
--- a/lib/utils/post-build.js
+++ b/lib/utils/post-build.js
@@ -1,9 +1,12 @@
+'use strict'
+
 import path from 'path'
 import glob from 'glob'
 import fs from 'fs-extra'
 import async from 'async'
 import parsePath from 'parse-filepath'
 import _ from 'underscore'
+
 const debug = require('debug')('gatsby:post-build')
 
 import globPages from './glob-pages'
@@ -41,9 +44,9 @@ module.exports = (program, cb) => {
         if (page) {
           newPath = parsePath(page.path).dirname + parsed.basename
         } else {
-          // We couldn't find a page associated with this file. Probably
-          // the file is in a directory of static files. In any case,
-          // we'll leave the file directory alone.
+          // We couldn't find a page associated with this file.
+          // Probably the file is in a directory of static files.
+          // In any case, we'll leave the file directory alone.
           newPath = relativePath
         }
       }
diff --git a/lib/utils/static-entry.jsx b/lib/utils/static-entry.js
similarity index 96%
rename from lib/utils/static-entry.jsx
rename to lib/utils/static-entry.js
index 7513085ed6e5c..36ce3e215cb6d 100644
--- a/lib/utils/static-entry.jsx
+++ b/lib/utils/static-entry.js
@@ -1,3 +1,4 @@
+'use strict'
 // Quick hack for having constant reactids when rendering in Server-side
 import ServerReactRootIndex from 'react/lib/ServerReactRootIndex'
 ServerReactRootIndex.createReactRootIndex = () => {
@@ -14,6 +15,7 @@ import HTML from 'html'
 import app from 'app'
 import values from 'config'
 import helpers from '../isomorphic/gatsby-helpers'
+
 const link = helpers.link
 let pages = values.pages
 const config = values.config
@@ -64,12 +66,13 @@ module.exports = (locals, callback) => {
           pages={pages}
           page={page}
           childPages={childPages}
-          state={state} />
+          state={state}
+        />
       )
       html = '<!DOCTYPE html>\n' + ReactDOMServer.renderToStaticMarkup(
           <HTML config={config} page={page} body={body} />
       )
-    } catch (e ) {
+    } catch (e) {
       console.error(e.stack)
     }
 
diff --git a/lib/utils/static-generation.coffee b/lib/utils/static-generation.coffee
deleted file mode 100644
index d04ca3c592053..0000000000000
--- a/lib/utils/static-generation.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-require('node-cjsx').transform()
-webpack = require 'webpack'
-globPages = require './glob-pages'
-webpackConfig = require './webpack.config'
-getUserGatsbyConfig = require './get-user-gatsby-config'
-debug = require('debug')('gatsby:static')
-
-module.exports = (program, callback) ->
-  {relativeDirectory, directory} = program
-
-  globPages directory, (err, pages) ->
-    debug('generating static site')
-    routes = pages.filter((page) -> page.path?).map((page) -> page.path)
-
-    #### Static site generation.
-    compilerConfig = webpackConfig(program, directory, 'static', null, routes)
-    config = getUserGatsbyConfig(compilerConfig, 'static')
-
-    webpack(config.resolve()).run (err, stats) ->
-      if err
-        return callback(err, stats)
-      if stats.hasErrors()
-        return callback('Error: ' + stats.toJson().errors, stats)
-      callback(null, stats)
diff --git a/lib/utils/static-generation.js b/lib/utils/static-generation.js
new file mode 100644
index 0000000000000..bbf6a6539ac78
--- /dev/null
+++ b/lib/utils/static-generation.js
@@ -0,0 +1,29 @@
+'use strict'
+
+import webpack from 'webpack'
+import globPages from './glob-pages'
+import webpackConfig from './webpack.config'
+import getUserGatsbyConfig from './get-user-gatsby-config'
+
+const debug = require('debug')('gatsby:static')
+
+module.exports = function (program, callback) {
+  const { directory } = program
+  return globPages(directory, function (err, pages) {
+    debug('generating static site')
+    const routes = pages.filter(function (page) { return (page.path !== null) }).map(function (page) { return page.path })
+
+    const compilerConfig = webpackConfig(program, directory, 'static', null, routes)
+    const config = getUserGatsbyConfig(compilerConfig, 'static')
+
+    return webpack(config.resolve()).run(function (error, stats) {
+      if (error) {
+        return callback(error, stats)
+      }
+      if (stats.hasErrors()) {
+        return callback('Error: ' + stats.toJson().errors, stats)
+      }
+      return callback(null, stats)
+    })
+  })
+}
diff --git a/lib/utils/web-entry.jsx b/lib/utils/web-entry.js
similarity index 92%
rename from lib/utils/web-entry.jsx
rename to lib/utils/web-entry.js
index ba1f93617b4d8..8f5c593dae168 100644
--- a/lib/utils/web-entry.jsx
+++ b/lib/utils/web-entry.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import React from 'react'
 import ReactDOM from 'react-dom'
 import Router from 'react-router'
@@ -54,7 +56,8 @@ loadConfig(function loadConfigFunc () {
             config={config}
             pages={pages}
             page={page}
-            state={state} />, typeof window !== 'undefined' ? document.getElementById('react-mount') : void 0)
+            state={state}
+          />, typeof window !== 'undefined' ? document.getElementById('react-mount') : void 0)
       })
     }
   })
diff --git a/lib/utils/webpack.config.js b/lib/utils/webpack.config.js
index 011b0605197c1..f01e4a58444a5 100644
--- a/lib/utils/webpack.config.js
+++ b/lib/utils/webpack.config.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import webpack from 'webpack'
 import StaticSiteGeneratorPlugin from 'static-site-generator-webpack-plugin'
 import Config from 'webpack-configurator'
@@ -5,9 +7,7 @@ import published from '../../bin/published'
 
 let gatsbyLib = /(gatsby.lib)/i
 // If installed globally, look for "dist" directory instead.
-if (published) {
-  gatsbyLib = /(gatsby.dist)/i
-}
+if (published) (gatsbyLib = /(gatsby.dist)/i)
 
 const libDirs = /(node_modules|bower_components)/i
 const babelExcludeTest = (absPath) => {
@@ -46,7 +46,7 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
           libraryTarget: 'umd',
         }
       default:
-        throw new Error('The state requested ' + stage + " doesn't exist.")
+        throw new Error('The state requested ' + stage + ' doesn\'t exist.')
     }
   }
 
@@ -67,7 +67,7 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
           `${__dirname}/static-entry`,
         ]
       default:
-        throw new Error('The state requested ' + stage + " doesn't exist.")
+        throw new Error('The state requested ' + stage + ' doesn\'t exist.')
     }
   }
 
@@ -106,13 +106,13 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
           }),
         ]
       default:
-        throw new Error('The state requested ' + stage + " doesn't exist.")
+        throw new Error('The state requested ' + stage + ' doesn\'t exist.')
     }
   }
 
   function resolve () {
     return {
-      extensions: ['', '.js', '.jsx', '.cjsx', '.coffee', '.json', '.less', '.toml', '.yaml'],
+      extensions: ['', '.js', '.jsx', '.json', '.less', '.toml', '.yaml'],
       modulesDirectories: [
         directory,
         `${__dirname}/../isomorphic`,
@@ -135,19 +135,11 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
 
   function module (config) {
     // common config for every env
-    config.loader('cjsx', {
-      test: /\.cjsx$/,
-      loaders: ['coffee', 'cjsx'],
-    })
     config.loader('js', {
       test: /\.jsx?$/,
       exclude: babelExcludeTest,
       loaders: ['babel'],
     })
-    config.loader('coffee', {
-      test: /\.coffee$/,
-      loader: 'coffee',
-    })
     config.loader('md', {
       test: /\.md$/,
       loader: 'markdown',
@@ -193,7 +185,7 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
       test: /config\.[toml|yaml|json]/,
       loader: 'config',
       query: {
-        directory: directory,
+        directory,
       },
     })
 
@@ -208,20 +200,12 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
           loaders: ['style', 'css', 'less'],
         })
         config.loader('js', {}, (cfg) => {
-          cfg.loaders.unshift('react-hot')
-          return cfg
-        })
-        config.loader('cjsx', {}, (cfg) => {
-          cfg.loaders.unshift('react-hot')
+          cfg.loaders.unshift('react-hot', 'babel')
           return cfg
         })
         return config
 
       case 'static':
-        config.loader('css', {
-          test: /\.css$/,
-          loaders: ['css'],
-        })
         config.loader('less', {
           test: /\.less/,
           loaders: ['css', 'less'],
diff --git a/package.json b/package.json
index d997644280b3b..b308d54d006c7 100644
--- a/package.json
+++ b/package.json
@@ -10,56 +10,51 @@
     "url": "https://github.com/gatsby-group/gatsby/issues"
   },
   "dependencies": {
-    "async": "^1.2.1",
-    "babel": "^5.8.29",
-    "babel-core": "^5.5.8",
-    "babel-loader": "^5.1.4",
-    "boom": "^2.7.2",
-    "cjsx-loader": "^2.0.1",
-    "coffee-loader": "^0.7.2",
-    "coffee-script": "^1.9.3",
-    "commander": "^2.8.1",
-    "css-loader": "^0.22.0",
+    "async": "^1.5.0",
+    "babel-loader": "^6.2.0",
+    "babel-register": "^6.3.13",
+    "boom": "^3.1.1",
+    "commander": "^2.9.0",
+    "css-loader": "^0.23.1",
     "debug": "^2.2.0",
-    "front-matter": "^1.0.0",
-    "fs-extra": "^0.19.0",
-    "glob": "^5.0.7",
+    "front-matter": "^2.0.1",
+    "fs-extra": "^0.26.3",
+    "glob": "^6.0.2",
     "hapi": "^8.5.1",
-    "highlight.js": "^8.6.0",
-    "json-loader": "^0.5.2",
-    "less": "^2.5.1",
-    "less-loader": "^2.2.0",
-    "loader-utils": "^0.2.8",
-    "lodash": "^3.9.3",
-    "loggy": "^0.2.0",
-    "markdown-it": "^5.0.0",
+    "highlight.js": "^9.0.0",
+    "json-loader": "^0.5.4",
+    "less": "^2.5.3",
+    "less-loader": "^2.2.2",
+    "loader-utils": "^0.2.12",
+    "lodash": "^3.10.1",
+    "loggy": "^0.2.2",
+    "markdown-it": "^5.0.2",
     "mkdirp": "^0.5.1",
-    "moment": "^2.10.3",
+    "moment": "^2.10.6",
     "ncp": "^2.0.0",
-    "negotiator": "^0.5.3",
-    "node-cjsx": "^1.0.0",
-    "node-libs-browser": "^0.5.2",
+    "negotiator": "^0.6.0",
+    "node-libs-browser": "^0.5.3",
     "null-loader": "^0.1.1",
     "object-assign": "^4.0.1",
-    "parse-filepath": "^0.5.0",
+    "parse-filepath": "^0.6.3",
     "raw-loader": "^0.5.1",
-    "react": "^0.14.2",
+    "react": "^0.14.3",
     "react-document-title": "^2.0.1",
-    "react-dom": "^0.14.2",
-    "react-hot-loader": "^1.2.7",
+    "react-dom": "^0.14.3",
+    "react-hot-loader": "^1.3.0",
     "react-router": "^0.13.5",
-    "rimraf": "^2.4.2",
-    "static-site-generator-webpack-plugin": "^1.0.0",
+    "rimraf": "^2.5.0",
+    "static-site-generator-webpack-plugin": "^2.0.1",
     "style-loader": "^0.13.0",
-    "toml": "^2.2.2",
+    "toml": "^2.3.0",
     "toml-loader": "^1.0.0",
     "typography": "^0.6.2",
     "underscore": "^1.8.3",
-    "underscore.string": "^3.1.1",
-    "webpack": "^1.12.8",
-    "webpack-configurator": "^0.3.0",
-    "webpack-dev-server": "1.12.1",
-    "webpack-require": "0.0.15"
+    "underscore.string": "^3.2.2",
+    "webpack": "^1.12.9",
+    "webpack-configurator": "^0.3.1",
+    "webpack-dev-server": "1.14.0",
+    "webpack-require": "0.0.16"
   },
   "homepage": "https://github.com/gatsby-group/gatsby#readme",
   "keywords": [
@@ -79,13 +74,17 @@
   },
   "scripts": {
     "test": "npm run lint",
+    "start": "./scripts/prepublish.sh && npm list",
     "lint": "./node_modules/.bin/eslint --ext .js,.jsx --ignore-pattern dist ."
   },
   "devDependencies": {
-    "babel": "^5.8.34",
-    "babel-eslint": "^4.1.6",
-    "eslint": "^1.10.2",
-    "eslint-config-airbnb": "^1.0.2",
-    "eslint-plugin-react": "^3.11.2"
+    "babel-core": "^6.3.26",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-react": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
+    "eslint": "^1.10.3",
+    "eslint-config-airbnb": "^2.1.1",
+    "eslint-plugin-react": "^3.13.1"
   }
 }
diff --git a/scripts/build.sh b/scripts/build.sh
index a0d486f275d9b..1964149582b7e 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,2 +1 @@
-node_modules/.bin/babel lib/ --out-dir dist
-node_modules/.bin/coffee -co dist/ lib/
+babel lib/ --out-dir dist/ --presets es2015,stage-0,react