Squashed commit of the following:

commit e12f3025bec3e62f926700bc5fa9952dd043cd17
Author: burkean <me@example.com>
Date:   Fri Feb 14 03:54:35 2014 +0100

    progress

commit db695083a96aff38da5655ec2df32a0ed834e89e
Author: burkean <me@example.com>
Date:   Wed Feb 12 10:13:53 2014 +0100

    fix naming issue
fx