Celery + Solr support

Pulled in the latest changes from the template and updated Solr states to mimic other states. Need to move conf/local/solr to margarita if this looks good. I think we need to destroy/rebuild the server in order for this to apply properly. Vagrant testing should work though.