Remove dupes, disable solr.
Merge branch 'ubuntu' of github.com:Laudanum/vagrant-puppet-drupal into ubuntu