(yay)
Merge branch 'nopowerline' of github.com:pcchou/rc-files into nopowerline