Updated to reflect my current setup and vim becoming my main editor