Merge branch 'master' into clostridium

* master:
  DS deprecation (rollback)
  Fix up moment js
  Drop brocfile
  ember-cli 1.13.8
  Fix transition deprecation
  Upgrade ember-cli-flash

app/helpers/null-time.js

@@ -1,7 +1,9 @@
 import Ember from 'ember';
 import { formatDate } from '../utils/date-helpers';
 
-export default Ember.Handlebars.makeBoundHelper(function(value, format) {
+export default Ember.Helper.helper(function(params) {
+  let value = params[0],
+    format = params[1];
   if (value == null) {
     return 'N/A';
   }

app/pods/login/controller.js

@@ -9,7 +9,7 @@ export default Ember.Controller.extend({
 
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      this.transitionTo('loading').then(() => {
+      this.transitionToRoute('loading').then(() => {
         session.authenticate(authenticator, credentials).then(null, (error)=> {
           this.get('flashMessages').error(error.error);
         });

app/pods/protected/species/edit/controller.js

@@ -20,7 +20,7 @@ export default Ember.Controller.extend({
       let species = this.get('model');
 
       species.get('errors').clear();
-      species.rollback();
+      species.rollbackAttributes();
 
       this.transitionToRoute('protected.species.show', species);
     },

app/pods/protected/strains/edit/controller.js

@@ -21,7 +21,7 @@ export default Ember.Controller.extend({
       let strain = this.get('strain');
 
       strain.get('errors').clear();
-      strain.rollback();
+      strain.rollbackAttributes();
 
       this.transitionToRoute('protected.strains.show', strain);
     },