Navi branch with "old" powerline config.

The recent update does not work with the old powerline config.  Thus my
config needs to be merged with the master branch which has the stock
config.