2 Merge branch 'master' of https://github.com/WizardFactory/BlogSyncer

2 Merge branch 'master' of https://github.com/WizardFactory/BlogSyncer

Conflicts:
	routes/blogbot.js
	routes/wordpress.js