Facebook comments support!

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

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
moving a few facebook things around

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'master' of github.com:ralsina/nikola

Conflicts:
	docs/manual.txt