Create a 'config' directory and rename 'config.sh' to 'config/default.sh'
Create a 'lib' directory and rename 'lib.sh' to 'lib/powerline.sh'
Merge commit 'e7ac58a' into custom
Merge commit 'bee86ba' into custom