fixin thangs, still need to re-add snipmate stuff