Swapped alignment plugins and reorganised vimrc.