added powerline
made update script actually work
fixed conflicts