diff --git a/.eslintrc b/.eslintrc
index 66280f24bc..b3d150ca04 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -8,6 +8,10 @@
   },
   "rules": {
       "camelcase": [0],
-      "no-console": [2, { allow: ["warn", "error"] }]
+      "no-underscore-dangle": [0],
+      "react/no-string-refs": [0],
+      "react/jsx-filename-extension": [0],
+      "import/prefer-default-export": [0],
+      "react/no-find-dom-node": [0]
   }
 }
diff --git a/package.json b/package.json
index 6432e47c92..021474a0ad 100644
--- a/package.json
+++ b/package.json
@@ -47,17 +47,17 @@
     "babel-preset-react": "^6.3.13",
     "chai": "^3.2.0",
     "chai-immutable": "^1.5.4",
-    "electron-mocha": "^1.2.2",
-    "electron-prebuilt": "^0.37.8",
+    "electron-mocha": "^3.0.4",
+    "electron-prebuilt": "^1.3.4",
     "enzyme": "^2.2.0",
-    "eslint": "^2.7.0",
-    "eslint-config-airbnb": "^8.0.0",
+    "eslint": "^3.3.1",
+    "eslint-config-airbnb": "^10.0.1",
     "eslint-plugin-import": "^1.5.0",
-    "eslint-plugin-jsx-a11y": "^1.0.2",
-    "eslint-plugin-react": "^5.0.1",
+    "eslint-plugin-jsx-a11y": "^2.1.0",
+    "eslint-plugin-react": "^6.1.2",
     "immutable": "^3.8.1",
     "mkdirp": "^0.5.1",
-    "mocha": "^2.2.5",
+    "mocha": "^3.0.2",
     "react": "^15.0.1",
     "react-addons-test-utils": "^15.0.1",
     "react-dom": "^15.0.1",
diff --git a/src/components/html-display.js b/src/components/html-display.js
index 4b5d6f964b..25d5393087 100644
--- a/src/components/html-display.js
+++ b/src/components/html-display.js
@@ -13,8 +13,6 @@ export default class HTMLDisplay extends React.Component {
         const fragment = range.createContextualFragment(this.props.data);
         ReactDOM.findDOMNode(this.refs.here).appendChild(fragment);
       } else {
-        console.warn('Environment does not support Range ' +
-          'createContextualFragment, falling back on innerHTML');
         ReactDOM.findDOMNode(this.refs.here).innerHTML = this.props.data;
       }
     }
diff --git a/src/components/image-display.js b/src/components/image-display.js
index fc168a42a2..ce062481f7 100644
--- a/src/components/image-display.js
+++ b/src/components/image-display.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 export function ImageDisplay(props) {
   return (
-    <img src={`data:${props.mimetype};base64,${props.data}`} />
+    <img role="presentation" src={`data:${props.mimetype};base64,${props.data}`} />
   );
 }
 
diff --git a/src/components/javascript-display.js b/src/components/javascript-display.js
index 5f41e898a3..67e078b6e9 100644
--- a/src/components/javascript-display.js
+++ b/src/components/javascript-display.js
@@ -14,7 +14,7 @@ export default class HTMLDisplay extends React.Component {
         const element = ReactDOM.findDOMNode(this.refs.here); // eslint-disable-line
         eval(this.props.data); // eslint-disable-line
       } catch (err) {
-        console.error('Could not execute user Javascript', err);
+        console.error('Could not execute user Javascript', err); //eslint-disable-line
       }
     }
   }
diff --git a/src/components/latex-display.js b/src/components/latex-display.js
index 1676e6d99a..b70c666341 100644
--- a/src/components/latex-display.js
+++ b/src/components/latex-display.js
@@ -1,18 +1,16 @@
 import React from 'react';
 import katex from 'katex';
 
-export default class LaTeXDisplay extends React.Component {
-  static propTypes = {
-    data: React.PropTypes.string,
-  }
-
-  render() {
-    return (
-      <div
-        dangerouslySetInnerHTML={{ // eslint-disable-line
-          __html: katex.renderToString(this.props.data),
-        }}
-      />
-    );
-  }
+export default function LaTeXDisplay(props) {
+  return (
+    <div
+      dangerouslySetInnerHTML={{ // eslint-disable-line
+        __html: katex.renderToString(props.data),
+      }}
+    />
+  );
 }
+
+LaTeXDisplay.propTypes = {
+  data: React.PropTypes.string,
+};
diff --git a/test/components/image_spec.js b/test/components/image_spec.js
index 5fafda8947..14cf81a471 100644
--- a/test/components/image_spec.js
+++ b/test/components/image_spec.js
@@ -17,7 +17,7 @@ describe('ImageDisplay', () => {
     const component = shallow(
       <ImageDisplay data={imageData} mimetype="image/png" />
     );
-    expect(component.html()).to.equal(`<img src="data:image/png;base64,${imageData}"/>`);
+    expect(component.html()).to.equal(`<img role="presentation" src="data:image/png;base64,${imageData}"/>`);
   });
 });