fixes as per the comments in getnikola pull request

via getnikola/plugins#13

[the commit log is nonsense for some crazy reason]