Small changes in config page
Merge branch 'develop' of github.com:emory-libraries/voyages into develop

Conflicts:
	voyages/apps/voyage/templates/voyage/search_config.html
Merge branch 'initial_search' into develop
Config page 90% done. Only needs to modify the view
Updated solr schema
Updated global variables
Finished config page for result page
Preparing urls for sources
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop
Minor changes to efficiency/readability in voyage search javascript
Merge branch 'develop' of github.com:emory-libraries/voyages into develop