Added alias for upstream merges
Fixed jekyll alias

Woulda swore I did this already.