import pelican bootstrap updates
Merge branch 'master' of https://github.com/nobukuma/pelican-bootstrap3