Squashed commit of the following:

commit ab4dd7d8f5d92e9c98c32bda8ddccf341b140a21
Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
Date:   Mon Jun 17 23:00:19 2013 -0400

    feature2 part 2

commit 43d20fd5d9e433e7e9b99b30def4b4eae6127ca1
Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
Date:   Mon Jun 17 22:51:48 2013 -0400

    feature2

commit 229d1fb99e1f97bc8731fca2432ae9cca5bc542d
Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
Date:   Mon Jun 17 22:50:12 2013 -0400

    Test

    commit 4338d9397411551791c686cc9c3541b872f0af70
    Author: Andrew Kennedy <andrew@jackrussellsoftware.com>
    Date:   Mon Jun 17 22:45:33 2013 -0400

        working on feature1