First merge of bitly_clone and dummy_users