added powerline
merged changes
added configuration for powerline