Moving the solr default weights code from search/views.py to settings.py
Moving default search weights to local_settings.py. Updating local_settings.example.py
Merge branch 'master' into production