Make it possible to import into your own folder.
Merge branch 'wpimport_wip'
Merge branch 'master' of https://github.com/ralsina/nikola
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
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