Merge pull request #265 from okin/master

Fixing failing tests
pep8-fy this garbage
Merge branch 'master' of github.com:ralsina/nikola
typo
unbreak python 2
pep8 fix
Use the --demo option in the tutorial
FIX #268
FIX #266
Really, really FIX #262
make sure all templates have the magic encoding comment
Update nikola/conf.py.in
Merge pull request #270 from Kwpolska/master

pl language info in conf.py.in
Fix #269
Merge branch 'master' of github.com:ralsina/nikola
Make English strings modifiable

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Merge pull request #272 from Kwpolska/master

Make English strings modifiable
monospace and orphan don't have javascript, and thus can't use jquery and don't require the colorbox.css (which is a jquery helper)
Minimal bundles file given jquery and bootstrap may come from CDNs
minor fix