Merge pull request #10 from daitken/7.x

7.x grammar fixes
Added travis-ci
Fixed lacking dependency for islandora_solr in travis-ci
Fixed solr dependency path
Updated mention and link to islandora_solr module in README to new islandora_solr_search module
Fixed coding standards issues.
Update call to islandora_solr_restore_slashes().
fixed some coding standards to get travis working
added fedora 3.6.2 to travis file
removing .DS_Store
Merge pull request #13 from philsogaDGI/7.x

Setup Travis and Tests
Add the ability to count collections.
Travis strikes again.
Filter out blank values from our Solr results so we don't generate extra commas.
Merge pull request #15 from jordandukart/7.x-fix-mvt

Filter out blank values from our Solr results so we don't generate extra...
Merge pull request #14 from jordandukart/7.x-collection-count

Add the ability to count collections.
Merge branch '7.x-fix-deprecated-call' of github.com:adam-vessey/islandora_solr_views into adam-vessey-7.x-fix-deprecated-call

Conflicts:
	islandora_solr_views_query.inc
Merge pull request #1 from Islandora/7.x

7.x update