diff --git a/.travis.yml b/.travis.yml
index 66dd1076..64533bea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
@@ -10,12 +10,11 @@ cache:
     - node_modules
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
diff --git a/.watchmanconfig b/.watchmanconfig
index 5e9462c2..e7834e3e 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/Brocfile.js b/Brocfile.js
index c92c963b..3253c97b 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -10,6 +10,7 @@ var templateTree = new HtmlbarsCompiler('app/templates', {
 });
 
 var app = new EmberApp({
+  'hinting': false,
   dotEnv: {
     clientAllowedKeys: [
       'GA',
diff --git a/app/app.js b/app/app.js
index 0676c1b8..6a19a69c 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 App = Ember.Application.extend({
   LOG_TRANSITIONS: true, // basic logging of successful transitions
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver,
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
diff --git a/app/initializers/data-attributes.js b/app/initializers/data-attributes.js
index ae2a7d9b..2a48d52c 100644
--- a/app/initializers/data-attributes.js
+++ b/app/initializers/data-attributes.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 export default {
   name: 'data-attributes',
   initialize: function() {
-    Ember.View.reopen({
+    Ember.Component.reopen({
       init: function() {
         this._super();
         var self = this;
diff --git a/app/resolver.js b/app/resolver.js
new file mode 100644
index 00000000..2fb563d6
--- /dev/null
+++ b/app/resolver.js
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
diff --git a/app/router.js b/app/router.js
index 74e02b63..73fa03d2 100644
--- a/app/router.js
+++ b/app/router.js
@@ -2,11 +2,11 @@ import Ember from 'ember';
 import config from './config/environment';
 import googlePageview from './mixins/google-pageview';
 
-var Router = Ember.Router.extend(googlePageview,{
+const Router = Ember.Router.extend(googlePageview,{
   location: config.locationType
 });
 
-export default Router.map(function() {
+Router.map(function() {
   this.route('search');
   this.route('downloads');
   this.route('colombia');
@@ -37,3 +37,5 @@ export default Router.map(function() {
   });
   this.route('rankings');
 });
+
+export default Router;
diff --git a/app/routes/index.js b/app/routes/index.js
index df9f3220..3569ba79 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -7,9 +7,9 @@ export default Ember.Route.extend({
   },
   model() {
     let hash = {
-     locations: this.store.find('location'),
-     products: this.store.find('product', { level: '4digit' }),
-     industries: this.store.find('industry', { level: 'division' })
+     locations: this.store.findAll('location'),
+     products: this.store.findAll('product', { level: '4digit' }),
+     industries: this.store.findAll('industry', { level: 'division' })
     };
 
     return RSVP.hash(hash).then((hash) => {
diff --git a/app/templates/components/graphbuilder-table.hbs b/app/templates/components/graphbuilder-table.hbs
index f041d60c..591103d0 100644
--- a/app/templates/components/graphbuilder-table.hbs
+++ b/app/templates/components/graphbuilder-table.hbs
@@ -1,8 +1,8 @@
 {{#if hasHeader}}
-  {{view "header-table-container"}}
+  {{header-table-container}}
 {{/if}}
 
-{{view "body-table-container"}}
+{{body-table-container}}
 
-{{view "scroll-container"}}
-{{view "column-sortable-indicator"}}
+{{scroll-container}}
+{{column-sortable-indicator}}
diff --git a/app/templates/components/search-result.hbs b/app/templates/components/search-result.hbs
index 21ae36a4..d3acd290 100644
--- a/app/templates/components/search-result.hbs
+++ b/app/templates/components/search-result.hbs
@@ -1,7 +1,7 @@
 <div class="results__text">
   {{#if isLocation }}
     <ul>
-      {{#each crumb in locationBreadcrumbs}}
+      {{#each locationBreadcrumbs as |crumb|}}
         <li class="results__breadcrumb">
           {{crumb.name_es}}
         </li>
diff --git a/app/templates/components/select-dropdown.hbs b/app/templates/components/select-dropdown.hbs
index dd5c4157..6c0d45db 100644
--- a/app/templates/components/select-dropdown.hbs
+++ b/app/templates/components/select-dropdown.hbs
@@ -1,7 +1,7 @@
 <div class="index__dropdown__wrap">
   <fieldset>
     <select name={{type}}>
-      {{#each item in collection }}
+      {{#each collection as |item|}}
         <option value={{item.id}} selected={{is-equal selected item.id}} >
           {{#if addCode}}
             {{item.name}}, {{item.code}}
diff --git a/app/templates/components/stream-header.hbs b/app/templates/components/stream-header.hbs
index 4eaeb43a..8b694d15 100644
--- a/app/templates/components/stream-header.hbs
+++ b/app/templates/components/stream-header.hbs
@@ -1,7 +1,7 @@
 <header class="stream__header stream__header--builder">
   {{#if isLocation}}
     <ul>
-      {{#each crumb in breadcrumbs}}
+      {{#each breadcrumbs as |crumb|}}
         {{#link-to 'location.show' crumb.id  tagName='li' class='breadcrumb'}}
           {{crumb.name_es}}
         {{/link-to}}
diff --git a/app/templates/components/visualization-legend.hbs b/app/templates/components/visualization-legend.hbs
index b24412ee..dddf22b1 100644
--- a/app/templates/components/visualization-legend.hbs
+++ b/app/templates/components/visualization-legend.hbs
@@ -1,8 +1,8 @@
 <div class="buildermod__legend">
-	{{#each key in legend}}
+	{{#each legend as |key|}}
 		<div class="buildermod__legend__item">
 	  		{{visualization-legend-key key=key }}
 	  	</div>
 	{{else}}
 	{{/each}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/partials/-buildermod-drawer-change-graph.hbs b/app/templates/partials/-buildermod-drawer-change-graph.hbs
index d2440697..60cf4d41 100644
--- a/app/templates/partials/-buildermod-drawer-change-graph.hbs
+++ b/app/templates/partials/-buildermod-drawer-change-graph.hbs
@@ -1,5 +1,5 @@
 <div class="change-visualization__container">
-  {{#each graph in otherPossibleGraphs}}
+  {{#each otherPossibleGraphs as |graph|}}
     {{#if graph.available}}
       {{component 'graphbuilder-change-graph'
         toggleVisualization='toggleVisualization'
diff --git a/app/templates/search.hbs b/app/templates/search.hbs
index b2388bcc..cf19b2db 100644
--- a/app/templates/search.hbs
+++ b/app/templates/search.hbs
@@ -26,7 +26,7 @@
 {{#if locationResults.length}}
   <h3 class="section__head results__subhead">{{t 'search.results_locations'}}</h3>
   <ul class="results__list">
-    {{#each result in locationResults}}
+    {{#each locationResults as |result|}}
       {{search-result
         result=result
         tagName="li"
@@ -40,7 +40,7 @@
 {{#if productResults.length}}
   <h3 class="section__head results__subhead">{{t 'search.results_products'}}</h3>
   <ul class="results__list">
-    {{#each result in productResults}}
+    {{#each productResults as |result|}}
       {{search-result
         result=result
         tagName="li"
@@ -52,7 +52,7 @@
 {{#if industryResults.length}}
   <h3 class="section__head results__subhead">{{t 'search.results_industries'}}</h3>
   <ul class="results__list">
-    {{#each result in industryResults}}
+    {{#each industryResults as |result|}}
       {{search-result
         result=result
         tagName="li"
diff --git a/app/templates/sortable-cell.hbs b/app/templates/sortable-cell.hbs
index 14129541..77a67288 100644
--- a/app/templates/sortable-cell.hbs
+++ b/app/templates/sortable-cell.hbs
@@ -1,13 +1,8 @@
-{{#if view.isModel }}
-  {{#link-to view.profileRoute view.id
-    tagName='span'
-    class="ember-table-content"
-  }}
-    {{{view.cellContent}}}
-  {{/link-to}}
+{{#if isModel }}
+    {{{cellContent}}}
 {{else}}
   <span class="ember-table-content-custom">
-    {{{view.cellContent}}}
+    {{{cellContent}}}
   </span>
 {{/if}}
 
diff --git a/app/templates/sortable-header-cell.hbs b/app/templates/sortable-header-cell.hbs
index b6c4c81b..46b3f947 100644
--- a/app/templates/sortable-header-cell.hbs
+++ b/app/templates/sortable-header-cell.hbs
@@ -1,6 +1,6 @@
-<div class="ember-table-content-container" {{action 'sortByColumn' view.content}}>
-  <span {{bind-attr class=":ember-table-content view.content.isAscending:table__header--is--ascending view.content.isDescending:table__header--is--descending"}}>
-    {{t view.content.headerCellName}}
+<div class="ember-table-content-container" {{action 'sortByColumn' content}}>
+  <span {{bind-attr class=":ember-table-content content.isAscending:table__header--is--ascending content.isDescending:table__header--is--descending"}}>
+    {{t content.headerCellName}}
   </span>
 </div>
 
diff --git a/bower.json b/bower.json
index 22084097..09d5c4f9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,14 +1,11 @@
 {
   "name": "atlas-colombia",
   "dependencies": {
-    "ember": "1.12.0",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember": "~2.5.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-load-initializers": "0.5.1",
+    "ember-qunit": "0.4.20",
     "jquery": "1.11.3",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1",
@@ -31,7 +28,6 @@
     "vis-toolkit": "https://github.com/cid-harvard/vis-toolkit.git#master"
   },
   "resolutions": {
-    "d3": "~3.5.5",
-    "qunit": "~1.17.1"
+    "d3": "~3.5.5"
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
new file mode 100644
index 00000000..2537ce2c
--- /dev/null
+++ b/ember-cli-build.js
@@ -0,0 +1,24 @@
+/*jshint node:true*/
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
+  //
+  // If you need to use different assets in different
+  // environments, specify an object as the first parameter. That
+  // object's keys should be the environment name and the values
+  // should be the asset to use in that environment.
+  //
+  // If the library that you are including contains AMD or ES6
+  // modules that you would like to import into your application
+  // please specify an object with the list of modules as keys
+  // along with the exports of each module as its value.
+
+  return app.toTree();
+};
diff --git a/package.json b/package.json
index 3447438d..a5e8b796 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
+    "start": "ember server",
     "test": "ember test"
   },
   "repository": "",
@@ -19,28 +19,34 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "1.13.1",
-    "ember-cli-app-version": "0.3.3",
-    "ember-cli-autoprefixer": "^0.3.0",
-    "ember-cli-babel": "^5.0.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
+    "broccoli-asset-rev": "^2.4.2",
+    "ember-ajax": "2.1.0",
+    "ember-cli": "2.5.0",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-babel": "^5.1.6",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars": "^1.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-jshint": "^1.0.0",
+    "ember-cli-qunit": "^1.4.0",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^2.1.0",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "^2.5.0",
+    "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.1",
+    "ember-resolver": "2.0.3",
+    "ember-table": "Addepar/ember-table#cyril/ember-2.0",
+    "ivy-tabs": "2.0.0",
+    "ember-i18n": "4.2.0",
+    "ember-cli-font-awesome": "1.5.0",
     "ember-cli-dotenv": "git://github.com/QuinnLee/ember-cli-dotenv.git",
-    "ember-cli-font-awesome": "1.2.0",
-    "ember-cli-github-pages": "0.0.4",
+    "ember-cli-content-security-policy": "0.5.0",
+    "ember-cli-autoprefixer": "^0.6.0",
     "ember-cli-google-analytics": "^1.3.2",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-numeral": "^0.1.2",
-    "ember-cli-qunit": "0.3.13",
-    "ember-cli-sass": "4.0.0-beta.6",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.18",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.2",
-    "ember-i18n": "4.1.1",
-    "ember-table": "0.9.2",
-    "ivy-tabs": "1.2.0"
+    "ember-cli-sass": "5.3.1",
+    "loader.js": "^4.0.1"
   }
 }
diff --git a/public/robots.txt b/public/robots.txt
index add10f66..f5916452 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,3 +1,3 @@
-http://www.robotstxt.org
+# http://www.robotstxt.org
 User-agent: *
-Disallow: /
+Disallow:
diff --git a/testem.js b/testem.js
new file mode 100644
index 00000000..26044b2f
--- /dev/null
+++ b/testem.js
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};
diff --git a/tests/.jshintrc b/tests/.jshintrc
index 3b50f112..14ffc32a 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -30,7 +30,7 @@
   ],
   "node": false,
   "browser": false,
-  "boss": true,
+  "curly": true,
   "curly": false,
   "debug": false,
   "devel": false,
@@ -47,7 +47,8 @@
   "onevar": false,
   "plusplus": false,
   "regexp": false,
-  "undef": true,
+  "esnext": true,
+  "unused": true
   "sub": true,
   "strict": false,
   "white": false,
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
new file mode 100644
index 00000000..c3d4d1ab
--- /dev/null
+++ b/tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
new file mode 100644
index 00000000..8c8b74ec
--- /dev/null
+++ b/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+
+      destroyApp(this.application);
+    }
+  });
+}
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
index 28f4ece4..b208d38d 100644
--- a/tests/helpers/resolver.js
+++ b/tests/helpers/resolver.js
@@ -1,7 +1,7 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 16cc7c39..e098f1d5 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -1,15 +1,14 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/tests/index.html b/tests/index.html
index d9ece68f..0bf9d372 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -7,27 +7,28 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/atlas-colombia.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/atlas-colombia.js"></script>
-    <script src="testem.js"></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>