Made errors at signup/login more consistent
seeded with SF users
removed solr index data
fixed merge conflits
fixed more conflicts