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