Merge pull request #2 from florence/master

Fixed some shit. Oh, and added Unicorn. </message>
in which Alice bitches about floats.
first merge conflict! merged things.
added Jack'n Zac
Merge pull request #3 from rpless/master

New term
reordered.
added better idiot.