Add pelicanfly plugin
Fixed merge conflicts for pelicanfly plugin
Merge in pelicanfly plugin