Jekyll 2.0 compatability

For a new installation this appears to work fine. I still need to do some testing. Anyone who's willing to try out upgrading to this branch, please post any issues and I'll try to address them in this PR.  If users have merge conflicts they should be minimal.