Merge before I Wreck everything with jekyll