Added supervisor base image
jdk7-oracle now includes supervisor
Added elasticsearch image