Add info on facebook integration
Remove pickle, which causes many merge errors
Merge branch 'master' into gh-pages

Conflicts:
	docs/html/searchindex.js