Make it possible to import into your own folder.
Merge branch 'wpimport_wip'
Merge branch 'master' of https://github.com/ralsina/nikola
detect 'namespace' dependencies in mako templates
Make it possible to import to an existing site. If the site did already exist the conf.py generated from the export will have a timestamp attached.
autopep8'ed
A workaround for the impossibility to install different requirements-files for different Python versions at travis-ci.org.
FIX #212 Use consistent encodings in RSS feeds.
FIX #216 enable comments in galleries.
Now able to install the dependencies from everywhere.
Showing the new option when informing the user about how to use this command.
Removing unused parameter.
Explained new option in manual. Added information to changelog.
Merge branch 'master' of https://github.com/ralsina/nikola

Conflicts:
	CHANGES.txt
Merge pull request #213 from okin/master

Wordpress Import: import into a user-defined location
Copy messages before installing. This makes it work with Python 3 and should probably run under Windows aswell.
Unlinking the messages folders.
Merge branch 'master' into travis
Merge pull request #218 from okin/master

Copy messages when installing
Merge pull request #219 from okin/travis

travis-ci.org: support for Python 3