Pull in latest abbott.vim developments