reorganised vim file and fixed colours. theme needs altering a bit still