Revert "Merge branch 'master' of https://github.com/AllTrips/glory-bowl"

This reverts commit abdacd2937e5c3c99ff19d3d876d97ff777059e5, reversing
changes made to 7a9a35e1c0b9d102e0464a376aefc53532dbe103.
Revert "Revert "Merge branch 'master' of https://github.com/AllTrips/glory-bowl""

Conflicts:

node_modules/express-cdn/node_modules/jpegtran-bin/node_modules/tar/node
_modules/fstream/package.json

node_modules/express-cdn/node_modules/optipng-bin/node_modules/bin-wrapp
er/node_modules/download/node_modules/decompress/node_modules/tar/node_m
odules/fstream/package.json

node_modules/express-cdn/node_modules/optipng-bin/node_modules/bin-wrapp
er/node_modules/isbin/node_modules/async/package.json