Bash flag for powerline was causing some strange issues with emerge
Merge branch 'master' into Jdeapad
Remove powerline inclusion in the bashrc since I'm not using it anymore
Merge branch 'master' into Jdeapad