Updating some stuff
Trying to remerge a divergence
Merge branch 'master' of https://github.com/jcc242/pelican-site