Reorganizing some settings. Fixing the line wrap on same line issue in bash.
Merge branch 'master' of github.com:aawc/dotfiles