Fix broken test on master (due to my checkin for waiting room disconnection, oops) and update Ubuntu setup instructions (I just set up on Ubuntu 14.10 and minor changes were needed)