Merge branch 'v0.6.2' of github.com:openhealthcare/elcid into v0.6.2

elcid/templates/acceptance/adt/discharging_patients.feature

@@ -19,5 +19,5 @@ Then I should be able to confirm the discharge
 Given a patient added to the ID Liason list
 Given that I am on the ID Liason list
 Given that that patient is selected
-I click discharge, the patient should be removed from the ID Liason
+When I click discharge, the patient should be removed from the ID Liason
 list.

elcid/templates/acceptance/opat/antimicrobial.feature

@@ -1,8 +1,6 @@
 As a User
 I need to record additional fields when I give/stop giving antimicrobials
 
-when I'm the list view, I click on Antimicrobial. It asks me for
-delivered by, adverse events, reason for stopping and comments.
-
-I can fill these in and they will save. I will be able to see delivered
-by in the record panel.
+Given I am on an OPAT list
+When I click on Antimicrobial
+Then There are fields for delivered by, adverse events, reason for stopping and comments.

elcid/templates/acceptance/opat/outcomes.feature

@@ -3,7 +3,7 @@ I need to record patient outcome, OPAT outcome, and primary infective diagnosis
 so that I can fulfill audit requirements
 
 Given a patient that has been added to OPAT referrals and confirmed
-I click the "Completed IV" action button
-I fill in patient outcome, OPAT outcome and primary infective diagnosis
-I then search for the patient name and see the data stored in the outcome record
-panel
+When I click the "Completed IV" action button
+When I fill in patient outcome, OPAT outcome and primary infective diagnosis
+When I then search for the patient name
+Then the outcomes data is displayed in the outcome record panel