Moved bundler_require to load time rather than run time. This fixes issues with rails engines
Merge branch 'plugins' into plugins_test
Fix for env