Moved bootstrap out to gem.
Fix merge conflict