remove bad fix for #259
remove bad fix for #259
Python 3 fixes from Mario Pozzo
minor cleanup of vimeo plugin
python 3 compat.
do the right thing in python 2 and 3
FIX #262  Also, FIX #263
Fixing tests.
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