added in some changes from svanzoest's vim setup