Ignore .vagrant
  http://docs.vagrantup.com/v1/docs/config/vagrant/dotfile_name.html
Initial work with solr submodule
Solr deploys unconfigured
Unzip and symlink matterhorn in place
Use Solr module
use solr module
Merge from upstream
TODO: Solr configuration directory and files
Merge pull request #2 from evilensky/solr

Merge upstream/master and solr into master.