Merge branch 'develop' of https://github.com/axlm/Environment into develop
Merge branch 'master' of https://github.com/axlm/Environment
Added support for powerline to vim, bash and tmux.
Merge branch 'develop'