added capf for env. variables

[nverno]

Hi, this just merges completion for environment variables with the prior completion. I also commented out the company backend since company-capf should work just as well here AFAIC.