Converted to bundler.
Merge branch 'bundler'

* bundler:
  Converted to bundler.
Update this opensource repo with updates from closed repository