pip caching was annoying me
Turned off YouCompleteMe for now
Resolved merge conflicts