Do a nikola import_wordpress into the existing blog
Add untracked files when deploying
Fix git add command

If you specify a path, it will complain about files in .gitignore
Make conf.py see the Wordpress posts