es 1.4.2 has been released
Merge branch 'master' of github.com:mikeplavsky/elasticsearch

Conflicts:
	Dockerfile