Remove sites/default/settings.php from .gitignore
Merge pull request #84 from dsnopek/openucb-379

OPENUCB-379: Add panopoly_search and use the patch to update search_api ...
Merge pull request #87 from bwood/openucb-407

Remove sites/default/settings.php from .gitignore
Commit files built from makefile: openberkeley_admin, openberkeley_base, openberkeley_pages, remove search_api_solr
Merge pull request #89 from ucbklu/develop-run-makefile-2014-08-29

Commit files built from makefile: openberkeley_admin, openberkeley_base,...
Merge branch 'develop' into openucb-348