fancy powerline only in gui mode
added .netrwhist to gitignore
Merge remote branch 'origin/master'