Merge branch 'master' into step_1_no_caching
Merge branch 'step_1_no_caching' of github.com:jcihocki/varnishd-skillshare into step_1_no_caching
Merge branch 'step_1_no_caching' into step_2_rack_cache
Merge branch 'step_2_rack_cache' into step_3_varnish_esi