Finishes up model.
authordsc <david.schoonover@gmail.com>
Sat, 24 Dec 2011 14:55:13 +0000 (06:55 -0800)
committerdsc <david.schoonover@gmail.com>
Sat, 24 Dec 2011 14:55:13 +0000 (06:55 -0800)

Trivial merge