updates
Merge branch 'master' of github.com:m4rkw/env
updated .vimrc