preliminary merge pass for test and network - database installes, rails apps runs