Fix the array diff.

array_diff_assoc() reads like it first does an array_diff() (which
compares the values) followed by an array_diff_key()...  I'm not sure,
but I digress. In any case, the related section of code should not be
taking the values into consideration at all.
Merge remote-tracking branch 'origin/7.x' into 7.x-fix-array-diff

Conflicts:
	includes/admin.inc
Change logic for determiniation of dismax availability.

No longer depends on submission of "Solr index" form.
Merge pull request #150 from adam-vessey/7.x-fix-dismax-detection

Change logic for determiniation of dismax availability.
Merge pull request #128 from adam-vessey/7.x-fix-array-diff

Fix the array diff.
Status would've been slightly off.
Merge pull request #151 from adam-vessey/7.x-fix-feature-status

Status would've been off.
Merge pull request #1 from Islandora/7.x

7.x update
two tests for solr
Merge branch '7.x' of https://github.com/qadan/islandora_solr_search into 7.x
remove those stupid DS_STOREs
and a touch more DS_STORE removal
i bet something will yell at me for no newline
coder issues
travis was yelling about t() abuse
Spelling.
Merge pull request #153 from jordandukart/7.x-spelling

Spelling.
Merge pull request #152 from qadan/7.x

7.x solr tests
Revert "Merge pull request #152 from qadan/7.x"

This reverts commit 54cc7f1790fd808fc9f147e830d2d6581e95a99c, reversing
changes made to 3004d8b8ebfbf0d1ef0eb22ac738e9b72a71a827.
Merge pull request #154 from jordandukart/7.x-revert-tests

Revert "Merge pull request #152 from qadan/7.x"