Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe style

delimiter, grouped by reference type and alphabetized within.