Gemfile.lock differnces, maybe due to using newer ruby
Remove javascript code for etherpad
ignored Gemfile.lock
merged in Gerry's etherpad removal
removed actual etherpad mod