Fix up some custom vim mappings
Remove unnecessary EC2 env vars