Merge branch 'develop'
Merge branch 'develop'

* develop:
  distribute: updates MANIFEST and distribute package
  drupal.setup_env: adds Github and Bitbucket fingerprints before cloning repository. Hides less output.
  Fixes solr indexing on local/remote builds
  Rebuild solr on drupal.build
Adds new env.settings dictionary that is interpolated in settings.php

Also adds deprecated library to store old setting interpolations
Merge branch 'feature/settings-interpolation' of github.com:duellj/butter into duellj-feature/settings-interpolation

* 'feature/settings-interpolation' of github.com:duellj/butter:
  Adds new env.settings dictionary that is interpolated in settings.php
Fixes pep8 error, spelling, and renames `default_settings` to `legacy_settings`.
Merge branch 'duellj-feature/settings-interpolation'

* duellj-feature/settings-interpolation:
  Fixes pep8 error, spelling, and renames `default_settings` to `legacy_settings`.
  Adds new env.settings dictionary that is interpolated in settings.php
Restrict robots.txt for QA/Staging servers
Reduce number of ssh calls when creating robots.txt file
Merge pull request #15 from duellj/feature/deploy-robots

Restricts robots.txt for QA/Staging servers (duellj)
Merge branch 'master' into feature/db-sync-s3

* master:
  Reduce number of ssh calls when creating robots.txt file
  Restrict robots.txt for QA/Staging servers
  Fixes pep8 error, spelling, and renames `default_settings` to `legacy_settings`.
  Adds new env.settings dictionary that is interpolated in settings.php

Conflicts:
	butter/drupal.py