Remove Gemfile.lock from repo
Update to combustion master to fix load order problem