Added ansi_esc plugin to colour console output; updates to vimrc, including commented list of nice themes
resolved merge conflict