Merge branch 'develop' of https://github.com/axlm/Environment into develop
Added powerline.