use_dis_max is deprecated in Elasticsearch 1.1.0

http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html#_literal_use_dis_max_literal
fixes broken tests, improper query construction for custom scoring
Merge pull request #473 from konklone/custom_score

Fix the build by fixing and restructuring custom scoring