Fixed syntax issues to get tests running again

Have a look through the diffs to see what changed.
It's mainly syntax tweaks, but I also fixed up your association.
Matt did you get my present?

Sent from my iPhone

> On Dec 20, 2014, at 7:15 AM, Matt West <notifications@github.com> wrote:
> 
> In test/fixtures/user_friendships.yml:
> 
> > @@ -4,8 +4,8 @@
> >  # model remove the '{}' from the fixture names and add the columns immediately
> >  # below each fixture, per the syntax in the comments below
> >  #
> > -one: {}
> > - user: chris
> > - friend: carl
> > +one:
> > +  user: chris
> > +  friend: carl
> >  two: {}
> Hi @donsalvadori
> 
> Sorry about the late reply. I hope you are well.
> 
> You may want to delete those details as this is a public repo :)
> 
> Have a great xmas
> 
> —
> Reply to this email directly or view it on GitHub.
>