added shoulda gem, new tests, friendship work