Moving to bundler. Fixing 1.9.3 errors.