get rid of pandoc in setup.py
Merge branch 'master' of https://github.com/wooyek/flask-social-blueprint

Conflicts:
	README.md