Refactored PS1 line to use tput; Fixed issues
Modularized bashrc.