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.
Not that I'm aware. You don't need the colons when defining factories.

This goes against the standard Ruby convention which is confusing, but just how FactoryGirl does things.