Align plugin, vimrc changes