This should not be here
Prevent on master too
Merge branch 'master' into bebanjo

* master:
  Prevent on master too
  This should not be here
Uncomment to be properly deleted
Merge branch 'master' into bebanjo

* master:
  Uncomment to be properly deleted
Trusty images

* using phusion/baseimage:0.9.10 as base image
* remove 2.1.1 ruby version from trusty image
* update elasticsearch to 1.2.1
* update mysql to 5.6
* using runit for service initialization
Merge branch 'trusty'
fixed redis server startup
dont clean apt cache
fixed elasticsearch and redis startup
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  fixed elasticsearch and redis startup
  dont clean apt cache
  fixed redis server startup
  Trusty images
Merge branch 'master' into bebanjo

* master:
  fixed elasticsearch and redis startup
  dont clean apt cache
  fixed redis server startup
  Trusty images
Rebase with current Vexor

- Adds Trusty images and docker 1.0.0
Merge branch 'bebanjo' into supervisor

* bebanjo:
  Rebase with current Vexor
  fixed elasticsearch and redis startup
  dont clean apt cache
  fixed redis server startup
  Trusty images
  Uncomment to be properly deleted
  Prevent on master too
  This should not be here
Using supervisors to start the services