Update shoulda-matcher gem
Add inverse_of for a few associations
Clean up + style fix