Commit 201566539f38874b4e93c6a36593bd0d10e6352c

Ben Straub 2013-04-15T13:29:40

Clean up minor details