Refactoring code and updating solr fields to use stored_sortable where appropriate
Merge branch 'refactor'