be a bit more robust
removed silly comment
Fix #626
Merge branch 'master' of github.com:ralsina/nikola