working on mac
install updated with powerline config files, other powerline files removed
merge conflicts resolved, powerline path for vim set appropriately