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.
lots of aesthetic changes here. Did you really alter anything in my gem file?