Fixed leftover conflicts in Gemfile.lock, and changed to 1.9 hash syntax.