update API for conceptnet 5.2
minor fix to Solr writer
updates for running on salmon.media.mit.edu
Merge branch 'master' of github.com:commonsense/conceptnet5
Merge remote-tracking branch 'origin/master' into newbuilder

Conflicts:
	conceptnet5/api.py