update totaltv base image for voxxit/ruby
Merge branch 'master' of github.com:totaltv/docker-base

Conflicts:
	Dockerfile