Apply omnibus 4 changes
Update fluent-plugin-webhdfs to v0.3.1
Change default timeout to 120
Update Fluentd to v0.10.55
Update plugin gems
Update ruby to 2.1.3
td-agent v2.1.1
Update Berksfile
Add Ubuntu 14.04 and update Debian images
Support new pkg/dmg way of Omnibus 4.0
Merge branch 'master' of https://github.com/treasure-data/omnibus-td-agent

Conflicts:
	config/projects/td-agent2.rb
	config/software/google-fluentd-files.rb
	resources/google-fluentd/mac_dmg/Resources/background.png
	resources/google-fluentd/mac_dmg/Resources/icon.png
	resources/google-fluentd/mac_pkg/Resources/background.png
	resources/google-fluentd/mac_pkg/Resources/license.html
	resources/td-agent/dmg/background.png
	resources/td-agent/dmg/icon.png
	resources/td-agent/mac_dmg/Resources/background.png
	resources/td-agent/mac_dmg/Resources/icon.png
	resources/td-agent/mac_pkg/Resources/background.png
	resources/td-agent/mac_pkg/Resources/license.html
	resources/td-agent/pkg/background.png
	resources/td-agent/pkg/license.html.erb
	resources/td-agent/pkg/welcome.html.erb
	templates/etc/init.d/rpm/google-fluentd
	templates/package-scripts/td-agent/pkg/postinstall