switched to airline for vim powerline
merging in new files