Abort installation if Gemfile.lock contains merge conflict markers

Proposed fix for issue #2000 - execution is fine, tests are possibly a bit icky though?