Make Bundler error message optional
Make some Rails things optional to get msfex working again
Merge branch 'master' into http-proxy