Squashed commit of the following:

commit e906b43c44a032f0b97d40b673090d09b6109cf7
Author: Matt Sexton <mattsexton@me.com>
Date:   Thu Jun 5 13:23:00 2014 -0700

    merge test three

commit 0f1fcbd9dab3d3b33e66af3fc5093ed9ce892a7a
Author: Matt Sexton <mattsexton@me.com>
Date:   Thu Jun 5 13:22:08 2014 -0700

    merge test two

commit 378832b17f2fc2b6f5a167453874cf9771a4e601
Author: Matt Sexton <mattsexton@me.com>
Date:   Thu Jun 5 13:21:31 2014 -0700

    merge test

commit 06068d2cd4721a663edd59c5bbecb549d7855946
Author: Matt Sexton <mattsexton@me.com>
Date:   Thu Jun 5 12:56:23 2014 -0700

    Revert "another test"

    This reverts commit 5fc97c14b74a798604494fcbd87f9e828bfc04dc.

commit 5fc97c14b74a798604494fcbd87f9e828bfc04dc
Author: Matt Sexton <mattsexton@me.com>
Date:   Thu Jun 5 12:40:09 2014 -0700

    another test