i think this is ready, right?

Closes #2

LGTM given by: @nickux

Squashed commit of the following:

commit 840568311bbace9ca232f6300b4ba68017a7d2d5
Author: Nick Johnson <nickj224@gmail.com>
Date:   Tue Dec 10 15:05:34 2013 -0500

    added h2