revert 0dc44f9998 and 3043d7f06b in favor of separate PR /issue #51
add .bosh_config to .gitignore
Release 15

This upgrades most dependencies in the stack and makes several improvements for
deployments running at larger scales.

 * UPGRADE: elasticsearch to 1.2.1 (#37)
 * UPGRADE: logstash to 1.4.1 (#45)
 * UPGRADE: kibana to 3.1.0 (#44)
 * UPGRADE: marvel to 1.2.1 (#37)
 * UPGRADE: logsearch-filters-common to v16
 * FIX: relp ingestor when `debug` is enabled (#53)
 * FIX: elasticsearch rolling its own `requests.log` file (#47)
 * ADD: disk/df metrics to collectd's default plugins (#64)
 * ADD: configurable `elasticsearch.log_level` setting, defaulting to `INFO` (#52)
 * REMOVE: elasticsearch garbage collection logging (#55)