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.
Hi Matt,

Been awhile, but you have been immensely helpful on my journey to learning
ruby. I thought maybe sometime in the future we could work on a project
together, but for now this is my way of saying thanks from the Americas to
England. I would like to share my subscription of Ruby Tapas with you
gratis, and we can both glean great information from the treasure trove of
short lessons they have there.

I will be traveling to brazil for a month after xmas, but I thought we
could keep in touch. I think you're a nice guy and could use some coder
friends, even if they're very remote. Sign in info below. Merry XMAS! Also
please do not share. This is solely between you and me :)

http://www.rubytapas.com/faq

Login: csalvi42@gmail.com
Password: AndyMurray15

On Wed, Oct 15, 2014 at 1:46 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: {}
>
> You only need the {} if you don't define any properties. One has
> properties, so it's only needed on two.
>
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/donsalvadori/treebook/pull/4/files#r18881251>.
>