v5 leftovers
Merge branch 'fix-bootswatch_theme' of github.com:areski/nikola into areski-fix-bootswatch_theme

Conflicts:
	nikola/plugins/command/bootswatch_theme.py
that did not make sense

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>