removed db auth user gem, using basic auth instead
merged gemfile from master
Merge branch 'step_3_varnish_esi' into step_4_varnish_esi_private_content