Using bundler pre again

Looks like the newly released bundler 1.3 didn't make it to travis yet because the builds continue to fail. Let's use this again in the meantime.
Merge remote-tracking branch 'upstream/master' into super-admin