Changed Twitter river API calls to be generic river CRUD calls, with twitter wrappers to avoid breaking changes