Minor edits from review 8 Jul 2014
Merge pull request #17 from g-weatherill/review_jul8

Minor edits from review 8 Jul 2014