improve demo - add bootstrap demo
Merge branch 'master' into improve-demo-bootstrap
make bootstrap3 default when using nikola init --demo
PEP8 fixes
Merge branch 'master' into improve-demo-bootstrap
Merge pull request #665 from areski/improve-demo-bootstrap

Improve demo bootstrap