Fixing indentation problems - #189
Merge branch 'master' of https://github.com/ralsina/nikola into import_indent
Updated changelog.
Py3k: Fixing tests.
Merge branch 'master' of https://github.com/ralsina/nikola into import_indent
Merge pull request #356 from okin/fix189

Fixing issue #189