Commit 7baa7631eab48fba1427b0c7b4b109da09dd050b

Jameson Miller 2013-10-02T15:39:18

Style tweaks and changes for code review feedback