pelican reboot
Merge pull request #4 from varta/master

Master
Revert "Master"
Merge pull request #5 from varta/revert-4-master

Revert "Master"
Merge pull request #6 from varta/gh-pages

pelican reboot update