Merge branch 'master' into clostridium

* master:
  Fix broken strain reference
  Rich text species and strains
  Add in quill WYSIWYG

app/pods/protected/species/show/template.hbs

@@ -34,7 +34,7 @@
         <dl class="span-1">
           <dt>Etymology</dt>
           <dd>
-            {{model.etymology}}
+            {{{model.etymology}}}
           </dd>
         </dl>
       </div>

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

@@ -18,7 +18,7 @@ export default Ember.Controller.extend({
     },
 
     cancel: function() {
-      let strain = this.get('protected.strain');
+      let strain = this.get('strain');
 
       strain.get('errors').clear();
       strain.rollback();

app/pods/protected/strains/show/template.hbs

@@ -49,7 +49,7 @@
       <dl class="span-1">
         <dt>Isolated From</dt>
         <dd>
-          {{model.isolatedFrom}}
+          {{{model.isolatedFrom}}}
         </dd>
       </dl>
     </div>
@@ -59,7 +59,7 @@
       <dl class="span-1">
         <dt>Notes</dt>
         <dd>
-          {{model.notes}}
+          {{{model.notes}}}
         </dd>
       </dl>
     </div>