More updates to golorize & vim formatting

Signed-off-by: Andrei Thorp <athorp@evernote.com>