Remove vimrc abbreviations and Java indent fix