Squashed commit of the following:

commit 0986f482cc64fcfd1fbb3e64a89d6bc67e41c995
Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
Date:   Mon Jun 17 22:57:26 2013 -0400

    feature3