Squashed commit of the following:

commit f522952c9934031927d161399065b05cd38d3a3e
Author: Dave De Carlo <dec114@gmail.com>
Date:   Wed May 14 13:47:16 2014 -0400

    upgraded to jekyll 2

commit 92962bd1d3e2c811d917725530b4b676b2d0504d
Author: Dave De Carlo <dec114@gmail.com>
Date:   Wed May 14 12:00:58 2014 -0400

    jekyll 2 initial commit