Changed a bunch of vim settings, switched commenting plugins, moved stuff around