Squashed commit of the following:

commit 68d6d3781d076d4f354270b2a9361d8df14f882e
Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
Date:   Mon Jun 17 22:52:59 2013 -0400

    master feature