UoYCS-plasma/GP2 — pull request #1 by jmct (2014-02-21 15:23:58+00:00)
Title: Merge dev into master

This will get the master branch up to date.

We'll need to work out a branching policy if collaboration is to go smoothly. :)