clean up berkshelf stuff, move server things to server.rb