New option: POWERLINE_DISABLE_RPROMPT
Merge remote-tracking branch 'origin/master'