More changes.
Some deletions.
Fixing merge problem with bash_config.