Switch to using bundler and speed up deploy a bit